aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Fix tests from rails.png removal.Jessica Lynn Suttles2013-04-021-1/+8
* Merge pull request #10056 from steveklabnik/remove_rails_pngDavid Heinemeier Hansson2013-04-023-1/+1
|\
| * adding .gigkeep to default app/assets/imagesSteve Klabnik2013-04-021-0/+0
| * Remove rails.png.Steve Klabnik2013-04-022-1/+1
* | Merge pull request #10054 from rubys/use_find_by_in_rdocSantiago Pastorino2013-04-0210-23/+23
|\ \
| * | Prefer find_by over dynamic finders in rdocSam Ruby2013-04-0210-23/+23
| |/
* | Merge pull request #10055 from vipulnsward/remove_each_with_index_in_testSantiago Pastorino2013-04-021-1/+1
|\ \ | |/ |/|
| * each_with_index => each as we dont use indexVipul A M2013-04-031-1/+1
* | Merge pull request #10053 from wangjohn/change_docs_for_associations_distinct...Steve Klabnik2013-04-021-6/+30
|\ \ | |/ |/|
| * Changed the guides to use distinct instead of uniq for associations (seewangjohn2013-04-021-6/+30
* | Merge pull request #3782 from arunagw/warning_mode_onSantiago Pastorino2013-04-021-1/+1
|\ \
| * | Turning on warnings in "rake test" for railtiesArun Agrawal2013-04-011-1/+1
* | | Merge pull request #9975 from mmangino/raise_when_attributes_cant_be_unserial...Aaron Patterson2013-04-022-14/+20
|\ \ \
| * | | Remove all error masking when decoding serialized data fails?Mike Mangino2013-04-022-15/+12
| * | | Raise an exception when unserialization fails due to a missing classMike Mangino2013-03-282-1/+10
* | | | Merge pull request #9971 from kennyj/refactor_tasksRafael Mendonça França2013-04-0211-61/+450
|\ \ \ \
| * | | | Add CHANGELOG entry about extracting and deprecating Firebird/Sqlserver/Oracl...kennyj2013-04-031-0/+5
| * | | | Show deprecated messages only when target database adapters definedYasuo Honda2013-04-033-3/+3
| * | | | Fix tiny problem: change method order for consistency and fix wrong method name.kennyj2013-04-032-2/+2
| * | | | Suppress deprecation messages for deprecated database tasks, when executing r...kennyj2013-04-033-0/+21
| * | | | Add deprecation message on Firebird / Sqlserver / Oracle database tasks.kennyj2013-04-033-0/+3
| * | | | Extract Oracle database tasks.kennyj2013-04-035-31/+140
| * | | | Extract Sqlserver database tasks.kennyj2013-04-035-11/+131
| * | | | Extract Firebird database tasks.kennyj2013-04-035-20/+151
* | | | | Merge pull request #10052 from neerajdotname/stdout-in-logRafael Mendonça França2013-04-022-2/+6
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | write sql queries to terminalNeeraj Singh2013-04-022-2/+6
* | | | | Merge pull request #10050 from neerajdotname/no-need-of-to_s-before-internRafael Mendonça França2013-04-021-1/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | no need to invoke to_s before applying internNeeraj Singh2013-04-021-1/+1
|/ / / /
* | | | Merge pull request #10048 from senny/replace_merge_with_relation_calls_in_cou...Rafael Mendonça França2013-04-021-17/+13
|\ \ \ \
| * | | | replace #merge with relation API calls in calculations_test.Yves Senn2013-04-021-17/+13
| | |_|/ | |/| |
* | | | Merge pull request #10038 from nateberkopec/sti-new-with-complex-inheritanceRafael Mendonça França2013-04-022-1/+5
|\ \ \ \
| * | | | Fix #new with an STI object with complex inheritanceNate Berkopec2013-04-022-1/+5
* | | | | Use released sdocSantiago Pastorino2013-04-021-1/+1
| |/ / / |/| | |
* | | | Merge pull request #10041 from vipulnsward/more_destructive_mergeSantiago Pastorino2013-04-022-2/+2
|\ \ \ \
| * | | | change merge to merge! in AS on new hashesVipul A M2013-04-022-2/+2
* | | | | Merge pull request #10042 from choudhuryanupam/fix_activesupport_testSantiago Pastorino2013-04-026-25/+37
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Added missing assertAnupam Choudhury2013-04-026-25/+37
|/ / / /
* | | | Revert "Use jquery-rails from github"Santiago Pastorino2013-04-021-3/+1
* | | | Revert "Use jquery-rails from github (fix Gem::Version error)"Santiago Pastorino2013-04-011-1/+1
|/ / /
* | | Merge pull request #10036 from wangjohn/norecord_error_message_consistency_is...Rafael Mendonça França2013-04-012-3/+1
|\ \ \
| * | | Updated the error message for +find+ on an inverse_of associationwangjohn2013-04-012-3/+1
|/ / /
* | | Fix release task after ceb3b8717beb9818fbfbab429a8aa697591e184aSantiago Pastorino2013-04-013-10/+27
* | | Revert more Rails.version changesRafael Mendonça França2013-04-014-5/+5
* | | Merge pull request #10022 from wangjohn/find_on_nonexistent_id_raises_errorRafael Mendonça França2013-04-013-12/+55
|\ \ \
| * | | Throwing a RecordNotFound exception when a record is scanned using thewangjohn2013-04-013-12/+55
* | | | :scissors:Rafael Mendonça França2013-04-011-4/+4
|/ / /
* | | Merge pull request #10033 from kalabiyau/fix_typo_on_ap_mime_types_testRafael Mendonça França2013-04-011-1/+1
|\ \ \
| * | | Fixed typo on AP dispatch Mime::Type testKalabiYau2013-04-011-1/+1
* | | | Remove CHANGELOG entry for #10002Rafael Mendonça França2013-04-011-4/+0
* | | | Merge pull request #10002 from charliesome/revert-version-method-on-railsJeremy Kemper2013-04-013-13/+16
|\ \ \ \ | |/ / / |/| | |