aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Changed asset_host config to more specificRahul P. Chaudhari2012-02-291-2/+2
* Some cleanup on the upgrading guideMike Gunderloy2012-02-281-14/+40
* Merge pull request #85 from whilefalse/rails_32_engine_upgradeVijay Dev2012-02-281-0/+12
|\
| * Added guide to updating engines built in previous versions of RailsSteven Anderson2012-02-241-0/+12
* | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-02-284-2/+20
|\ \
| * | move the strict validations to an appropriate section and some edits [ci skip]Vijay Dev2012-02-281-14/+12
| * | copy edits [ci skip]Vijay Dev2012-02-281-1/+1
| * | Add brief summary of strict validations added in 3.2.Oliver Legg2012-02-271-0/+14
| * | Correct NullStore cache store name in caching guideToby Matejovsky2012-02-271-1/+1
| * | document how to create non show paths from an array of parametersFlorent Guilleux2012-02-261-0/+6
| * | reverted regular expression fixTima Maslyuchenko2012-02-261-2/+2
| * | Merge branch 'master' of github.com:lifo/docrailsTima Maslyuchenko2012-02-261-1/+1
| |\ \
| | * | layout affects views not methodsRajinder Yadav2012-02-261-1/+1
| * | | fixed regular expression in Specifying Constraints sectionTima Maslyuchenko2012-02-261-2/+2
| |/ /
* | | Merge pull request #4284 from mattdbridges/time_calculation_aliasesXavier Noria2012-02-286-6/+80
|\ \ \
| * | | Adding :last_week, :last_month, and :last_year aliases to Time and DateMatt Bridges2012-02-216-6/+80
* | | | Merge pull request #5199 from gabehollombe/masterXavier Noria2012-02-281-2/+3
|\ \ \ \
| * | | | Change asset_host config language to be more helpful and accurateGabe Hollombe2012-02-281-2/+3
* | | | | Merge pull request #5197 from lest/patch-4José Valim2012-02-271-6/+0
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | remove unnecessary codeSergey Nartimov2012-02-281-6/+0
* | | | | Revert "only mutate the scope object in the `bind` method"Aaron Patterson2012-02-271-1/+1
* | | | | call binmode on the tempfile for Ruby 1.8 compatibilityAaron Patterson2012-02-271-1/+2
* | | | | only mutate the scope object in the `bind` methodAaron Patterson2012-02-271-1/+1
* | | | | bind value creation refactoringAaron Patterson2012-02-271-4/+10
|/ / / /
* | | | removing dead codeAaron Patterson2012-02-271-3/+2
* | | | use bind values for join columnsAaron Patterson2012-02-276-12/+36
* | | | Merge pull request #5191 from rafaelfranca/fix-393Aaron Patterson2012-02-273-38/+38
|\ \ \ \
| * | | | Add a new line after the textarea opening tag.Rafael Mendonça França2012-02-273-38/+38
* | | | | Merge pull request #5168 from kennyj/fix_5152Aaron Patterson2012-02-272-1/+6
|\ \ \ \ \
| * | | | | Remove NULLS FIRST/LAST. closes #5152kennyj2012-02-252-1/+6
* | | | | | Merge pull request #5173 from kennyj/fix_3931-2Aaron Patterson2012-02-273-12/+23
|\ \ \ \ \ \
| * | | | | | Fix type_to_sql with text and limit on mysql/mysql2. Fix GH #3931.kennyj2012-02-263-12/+23
* | | | | | | Merge pull request #5179 from RalphShnelvar/Binary_mode_Window_bugAaron Patterson2012-02-271-1/+1
* | | | | | | Merge pull request #5192 from amatsuda/rdoc_task_19José Valim2012-02-272-14/+3
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | ruby19: no need to rescue when requiring 'rdoc/task' in Ruby >= 1.9Akira Matsuda2012-02-272-14/+3
|/ / / / / /
* | | | | | Merge pull request #5185 from rafaelfranca/fix-collection_helpersJosé Valim2012-02-263-37/+76
|\ \ \ \ \ \
| * | | | | | Fix collection_check_boxes and collection_radio_buttons when using localRafael Mendonça França2012-02-262-0/+39
| * | | | | | Add documentation to object method of CollectionHelpers::BuilderRafael Mendonça França2012-02-261-6/+6
| * | | | | | Move all the helpers to protected sectionRafael Mendonça França2012-02-261-31/+31
|/ / / / / /
* | | | | | updates the new default pool size in some additional placesXavier Noria2012-02-263-7/+17
* | | | | | let the connection pool of new applications have size 1 rather than 5Xavier Noria2012-02-264-12/+36
* | | | | | Adding tests for non-optional glob parametersAndrew White2012-02-261-2/+27
* | | | | | Merge pull request #5174 from nashby/safe-concatJosé Valim2012-02-251-3/+4
|\ \ \ \ \ \
| * | | | | | use content_tag instead stringsVasiliy Ermolovich2012-02-251-3/+4
|/ / / / / /
* | | | / / A guide for upgrading Rails [ci skip]Vijay Dev2012-02-252-0/+169
| |_|_|/ / |/| | | |
* | | | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-02-255-5/+24
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | copy-edits [ci skip]Vijay Dev2012-02-251-10/+8
| * | | | Fixed typo in composed_of example with Money#<=>, was comparing amount itself...Noah Hendrix2012-02-241-1/+1
| | |_|/ | |/| |
| * | | Fix typo in match :to docsJustin Woodbridge2012-02-231-1/+1
| * | | Cosmetic fixes in AM changelogAlexey Vakhov2012-02-231-1/+1