aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | Fix GH #4749. Remove branch options, because edge is not 3-2-stable.kennyj2012-02-012-2/+7
* | | Merge pull request #4811 from rafaelfranca/3-2-stable-fixSantiago Pastorino2012-01-313-13/+13
|\| |
| * | Fix broken tests added by 85c724d59Rafael Mendonça França2012-01-313-13/+13
|/ /
* | Improve deprecation messageJon Leighton2012-01-311-7/+17
* | Merge pull request #4735 from arton/masterAaron Patterson2012-01-311-1/+5
* | Merge pull request #4779 from bsodmike/bsodmike-3-2-stableAaron Patterson2012-01-311-1/+1
|\ \
| * | clarification to prevent confusing newbies; Passenger/Unicorn are app servers...Michael de Silva2012-01-311-1/+1
* | | Merge pull request #4793 from kennyj/fix_4760José Valim2012-01-312-2/+11
|\ \ \
| * | | Fix GH #4760. A Block was not evaluated.kennyj2012-01-312-2/+11
* | | | Merge pull request #4783 from gregolsen/ids_reader_fixJon Leighton2012-01-313-1/+6
* | | | Merge pull request #4790 from marten/fix-require-deprecation-in-activesupportJosé Valim2012-01-314-0/+7
|\ \ \ \
| * | | | Fix use of Deprecation without requiring active_support/deprecation in whiny nilMarten Veldthuis2012-01-311-0/+2
| * | | | Fix use of Deprecation without requiring active_support/deprecation in messag...Marten Veldthuis2012-01-311-0/+1
| * | | | Fix use of Deprecation without requiring active_support/deprecation in Active...Marten Veldthuis2012-01-311-0/+2
| * | | | Fix use of Deprecation without requiring active_support/deprecation in Active...Marten Veldthuis2012-01-311-0/+2
|/ / / /
* | | | Merge pull request #4786 from lest/patch-2José Valim2012-01-311-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | fix assets testSergey Nartimov2012-01-311-1/+1
|/ / /
* | | Allow writing unknown attributes, but with a deprecation warning. Closes #4583.Jon Leighton2012-01-312-4/+14
* | | Add workaround and deprecation if the inherited hook is not executed. Closes ...Jon Leighton2012-01-312-0/+22
* | | Merge pull request #4763 from kennyj/fix_4754Jon Leighton2012-01-312-1/+17
|/ /
* | query cache instrumentation should included the bindings in the payload [clos...Xavier Noria2012-01-301-1/+1
* | fix typo [ci skip]Vijay Dev2012-01-301-1/+1
* | Inline the prefix assignment so it doesnt look so daftDavid Heinemeier Hansson2012-01-271-2/+1
* | Revert "Fix expanding cache key for single element arrays"David Heinemeier Hansson2012-01-272-16/+8
* | Merge check box fixes from remote-tracking branch 'cantonio/checkbox-hidden-b...José Valim2012-01-273-5/+18
|\ \ | |/ |/|
| * don't set the hidden checkbox value if it's nilDamien Mathieu2012-01-272-1/+9
| * check_box helper with :disabled => true generates disabled hidden field. fixe...Tadas Tamošauskas2012-01-273-5/+8
|/
* Merge pull request #4715 from pwim/find-create-multi-argsJon Leighton2012-01-272-1/+12
* fixes whitespace in CHANGELOG entriesXavier Noria2012-01-263-3/+3
* updating RAILS_VERSIONXavier Noria2012-01-269-9/+9
* CHANGELOG revision for v3.2.1Xavier Noria2012-01-267-2/+50
* Revert usage of safe constantizeJosé Valim2012-01-261-1/+3
* safe_constantize should handle wrong constant name NameErrors Fixes #4710Alex Tambellini2012-01-262-3/+4
* bumping journey to 1.0.1Aaron Patterson2012-01-261-1/+1
* Merge pull request #4696 from rafaelfranca/issue-4653Aaron Patterson2012-01-261-2/+0
|\
| * Remove extra attributes from HABTM join tables in AR testsRafael Mendonça França2012-01-261-2/+0
* | global variables may not be set depending on the match. fixes #4703Aaron Patterson2012-01-262-1/+8
* | registers 2483460 in the CHANGELOGXavier Noria2012-01-261-3/+5
* | disable automatic explain if there is no logger [closes #4671]Xavier Noria2012-01-263-1/+20
|/
* Fix contributing guide to reflect preferred position on indentationbrainopia2012-01-261-1/+1
* call to_s on value passed to table_name=Sergey Nartimov2012-01-262-1/+6
* Merge pull request #4675 from lunks/3-2-stableAaron Patterson2012-01-251-1/+1
|\
| * Duping log handler. fixes #4668Pedro Nascimento2012-01-251-1/+1
* | Merge pull request #4673 from carlosantoniodasilva/validation-guides-update-3-2Vijay Dev2012-01-256-25/+34
|\ \ | |/ |/|
| * Fix callbacks order for destroying an object in validations guideCarlos Antonio da Silva2012-01-251-2/+4
| * Improve field error proc example in validations guideCarlos Antonio da Silva2012-01-251-7/+2
| * Change ActiveRecord::Errors to ActiveModel::Errors in guidesCarlos Antonio da Silva2012-01-256-14/+14
| * Fix custom validation methods section in AR validations and callbacks guideCarlos Antonio da Silva2012-01-251-2/+14
* | remove extra 'the'Rohit Arondekar2012-01-261-1/+1
* | example bracket errorDamian Le Nouaille2012-01-261-1/+1