aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | Merge pull request #9975 from ↵Aaron Patterson2013-04-022-14/+20
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | mmangino/raise_when_attributes_cant_be_unserialized Unserializing YAML attributes can silently fail in development mode
| * | | | | 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
|\ \ \ \ \ \ | | | | | | | | | | | | | | Extract Firebird / Sqlserver / Oracle database tasks, and They should be deprecated.
| * | | | | | Add CHANGELOG entry about extracting and deprecating ↵kennyj2013-04-031-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Firebird/Sqlserver/Oracle database tasks.
| * | | | | | 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 ↵kennyj2013-04-033-0/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | rails's testcases.
| * | | | | | 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 terminal
| * | | | | | 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 intern
| * | | | | | no need to invoke to_s before applying internNeeraj Singh2013-04-021-1/+1
|/ / / / / /
* | | | | | Merge pull request #10048 from ↵Rafael Mendonça França2013-04-021-17/+13
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | senny/replace_merge_with_relation_calls_in_count_api replace #merge with relation API calls in calculations_test.
| * | | | | | 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 regression re: #new with an STI object & complex inheritance
| * | | | | | 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 hashes
| * | | | | | 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 assert
| * | | | | | Added missing assertAnupam Choudhury2013-04-026-25/+37
|/ / / / / /
* | | | | | Revert "Use jquery-rails from github"Santiago Pastorino2013-04-021-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 7a9a7007637b8279501770be03bd84ce83d61ab8. Conflicts: railties/lib/rails/generators/app_base.rb
* | | | | | Revert "Use jquery-rails from github (fix Gem::Version error)"Santiago Pastorino2013-04-011-1/+1
|/ / / / / | | | | | | | | | | | | | | | This reverts commit 6f3f0f86332004fcee5c2f05d52bbff08c22f980.
* | | | | Merge pull request #10036 from ↵Rafael Mendonça França2013-04-012-3/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | wangjohn/norecord_error_message_consistency_issues Updated the error message for find to stay consistent across Rails
| * | | | | Updated the error message for +find+ on an inverse_of associationwangjohn2013-04-012-3/+1
|/ / / / / | | | | | | | | | | | | | | | | | | | | so that it is consistent with the error thrown for +find+ without an inverse_of association.
* | | | | Fix release task after ceb3b8717beb9818fbfbab429a8aa697591e184aSantiago Pastorino2013-04-013-10/+27
| | | | |
* | | | | Revert more Rails.version changesRafael Mendonça França2013-04-014-5/+5
| | | | | | | | | | | | | | | | | | | | Related with ed8df3ff018d17fad123e48c7cb907332e72e7dc
* | | | | 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 the inverse_of option
| * | | | | Throwing a RecordNotFound exception when a record is scanned using thewangjohn2013-04-013-12/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | inverse_of option. I've also refactored the code for raising a RecordNotFound exception when searching for records with ids.
* | | | | | :scissors:Rafael Mendonça França2013-04-011-4/+4
|/ / / / / | | | | | | | | | | | | | | | [ci skip]
* | | | | 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 test
| * | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | Merge pull request #10002 from charliesome/revert-version-method-on-railsJeremy Kemper2013-04-013-13/+16
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Reverts changes to Rails.version made in #8501
| * | | | | reverts changes to Rails.version made in #8501Charlie Somerville2013-03-303-13/+16
| | | | | |
* | | | | | :uniq is still a valid relation option since it was only silentlyRafael Mendonça França2013-04-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | deprecated Fixes activerecord-deprecated_finders build. https://travis-ci.org/rails/activerecord-deprecated_finders/builds/5964703
* | | | | | Merge pull request #10031 from trevorturk/cookie-store-auto-upgrade-docsSantiago Pastorino2013-04-012-23/+40
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | Improve documentation around the cookie store auto-upgrade to encryption
| * | | | | Improve documentation around the cookie store auto-upgrade to encryptionTrevor Turk2013-04-012-23/+40
| | | | | |
* | | | | | Merge pull request #10010 from pwnall/fix_ref_index_trueRafael Mendonça França2013-04-011-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Make references with index:true pass Hash options to add_index
| * | | | | | Make references with index:true pass Hash options to add_index.Victor Costan2013-04-011-1/+1
| | | | | | |
* | | | | | | Move the class methods to above the protected sectionRafael Mendonça França2013-04-013-47/+36
| | | | | | |
* | | | | | | Merge pull request #10021 from pabloh/refactor_rails_generator_test_caseRafael Mendonça França2013-04-014-211/+259
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Refactor Rails::Generator::TestCase into modules
| * | | | | | | Break down Rails::Generator::TestCase into modulesPablo Herrero2013-03-314-211/+259
| | | | | | | |
* | | | | | | | Merge pull request #10025 from masarakki/fix_detect_enum_column_on_mysqlRafael Mendonça França2013-04-015-6/+6
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | fix detect column type of enum
| * | | | | | | fix detect column type of enummasarakki2013-04-015-6/+6
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | enum includes text or blob or ... hooked by wrong regex
* | | | | | | Merge pull request #9978 from trevorturk/cookie-store-auto-upgradeSantiago Pastorino2013-04-0111-99/+239
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Cookie-base session store auto-upgrade