aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #7232 from kennyj/fix_7200Carlos Antonio da Silva2012-08-022-1/+6
|\
| * Backport #5168 to 3-2-stable. Fix a problem that NULLS is ignored by postgres...kennyj2012-08-022-1/+6
* | Merge pull request #7235 from ffmike/mocha_12_2_compatCarlos Antonio da Silva2012-08-021-1/+3
|\|
| * Fix ActiveSupport integration with Mocha > 0.12.1Mike Gunderloy2012-08-021-1/+3
|/
* This entry is wrongSantiago Pastorino2012-08-011-2/+0
* Bump to 3.2.8.rc1Santiago Pastorino2012-08-019-17/+17
* Revert "Deprecate link_to_function and button_to_function helpers"Rafael Mendonça França2012-08-013-28/+16
* Revert "Deprecate `:mouseover` options for `image_tag` helper."Rafael Mendonça França2012-08-013-42/+10
* Revert "Deprecate ActiveSupport::JSON::Variable"Rafael Mendonça França2012-08-013-23/+14
* Fix CHANGELOGSRafael Mendonça França2012-08-012-14/+38
* removes the deprecation of update_attributeXavier Noria2012-08-012-3/+2
* revises the deprecation warning of update_attributeXavier Noria2012-08-012-2/+2
* Revert "Deprecate `:confirm` in favor of `:data => { :confirm => 'Text' }` op...Rafael Mendonça França2012-08-018-188/+63
* Revert "Deprecating composed_of in ActiveRecord"Rafael Mendonça França2012-08-015-24/+7
* Revert "Deprecate :finder_sql, :counter_sql, :insert_sql, :delete_sql."Jon Leighton2012-08-018-97/+38
* Add missing CHANGELOG entriesSantiago Pastorino2012-08-017-10/+41
* Merge pull request #7070 from jmazzi/3-2-stableRafael Mendonça França2012-08-011-3/+6
|\
| * Update documentation for Rails::Application#env_configJustin Mazzi2012-07-161-3/+6
* | Merge pull request #7147 from pferdefleisch/scaffold_controller_docsRafael Mendonça França2012-07-311-4/+3
* | Add CHANGELOG entry [ci skip]Rafael Mendonça França2012-07-311-0/+8
* | Revert "Add update_columns and the suggestion of using update_columnsRafael Mendonça França2012-07-304-78/+2
* | removes the AR session store from eager loaded code [fixes #7160]Xavier Noria2012-07-291-1/+10
* | Merge pull request #7187 from frodsan/fix_test_helpRafael Mendonça França2012-07-281-2/+2
|\ \
| * | Backport #6995 to 3-2 stableFrancesco Rodriguez2012-07-281-2/+2
|/ /
* | missing require: the AR session store depends on the AP abstract storeXavier Noria2012-07-281-0/+2
* | adds a missing require from Active SupportXavier Noria2012-07-281-0/+1
* | Only require the `:rails_env` task where is needed.Rafael Mendonça França2012-07-271-13/+13
* | Merge branch '3-2-rel' into 3-2-stableAaron Patterson2012-07-2617-12/+57
|\ \
| * | updating release dateAaron Patterson2012-07-267-7/+7
| * | bumping to 3.2.7Aaron Patterson2012-07-269-9/+9
| * | updating the changelogAaron Patterson2012-07-261-0/+2
| * | * Do not convert digest auth strings to symbols. CVE-2012-3424Aaron Patterson2012-07-261-2/+2
| * | updating the versionAaron Patterson2012-07-238-16/+16
| * | updating changelogsAaron Patterson2012-07-237-1/+44
* | | Merge pull request #7164 from parndt/patch-4Rafael Mendonça França2012-07-251-1/+1
|\ \ \
| * | | Switched update_column recommendation in changelog to update_columnsPhilip Arndt2012-07-261-1/+1
|/ / /
* | | Fix AR#update_columns tests on Ruby 1.8.7Carlos Antonio da Silva2012-07-251-7/+7
* | | Merge pull request #7159 from parndt/update_columnsAaron Patterson2012-07-253-1/+77
|\ \ \ | |/ / |/| |
| * | Suggest using update_columns instead of update_column.Philip Arndt2012-07-261-1/+1
| * | New #update_columns method.Sebastian Martinez2012-07-263-0/+76
|/ /
* | Bump Journey requirements to 1.0.4Andrew White2012-07-231-1/+1
* | Hash#fetch(fetch) is not the same as doing hash[key]Xavier Noria2012-07-211-1/+11
* | `validates_inclusion_of` and `validates_exclusion_of` now acceptRafael Mendonça França2012-07-205-10/+60
* | Deprecate :finder_sql, :counter_sql, :insert_sql, :delete_sql.Jon Leighton2012-07-208-35/+108
* | Merge pull request #6616 from dpassage/fix_resolver_test_sqlite3Carlos Antonio da Silva2012-07-191-0/+3
* | Merge pull request #7108 from arunagw/mocha_bumpRafael Mendonça França2012-07-191-1/+1
|\ \
| * | Bumping mocha!Arun Agrawal2012-07-191-1/+1
| |/
* | Merge pull request #7080 from jfirebaugh/to_param_regressionJon Leighton2012-07-172-1/+7
|\ \
| * | AR::Integration must be included after AM::ConversionJohn Firebaugh2012-07-172-1/+7
|/ /
* | Add support for optional root segments containing slashesAndrew White2012-07-172-1/+27