aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Define attribute methods before attempting to populate recordsSean Griffin2015-01-051-1/+1
| | | | | | | | `initialize_internals_callback` will attempt to assign attributes from the current scope, which will fail if something defined the method and calls super (meaning it won't hit `method_missing`). Fixes #18339
* Whitespace fixes from #18349Sean Griffin2015-01-051-2/+1
|
* Merge pull request #18349 from jdelStrother/primarykeylessSean Griffin2015-01-052-1/+23
|\ | | | | Fix rollback of primarykey-less tables
| * Fix rollback of primarykey-less tablesJonathan del Strother2015-01-052-1/+23
| | | | | | If you have a table without a primary key, and an `after_commit` callback on that table (ie `has_transactional_callbacks?` returns true), then trying to rollback a transaction involving that record would result in “ActiveModel::MissingAttributeError: can't write unknown attribute ``”
* | Avoid changing the global state on the testsRafael Mendonça França2015-01-051-1/+6
| |
* | Merge pull request #17676 from ↵Rafael Mendonça França2015-01-052-6/+27
|\ \ | | | | | | | | | | | | | | | tigrish/fix_custom_i18n_exception_handler_regression Fix I18n regression introduced by #13832
| * | Fix I18n regression introduced by #13832Christopher Dell2014-11-192-6/+27
| | | | | | | | | | | | Previously, when the `:raise` options was set to `false`, it would get overwritten to `true`, preventing custom exception handlers to be used.
* | | Merge pull request #17720 from rzane/firebird-test-supportRafael Mendonça França2015-01-055-21/+28
|\ \ \ | | | | | | | | | | | | Add Firebird support to test suite
| * | | Add firebird support to test suiteRay Zane2015-01-055-21/+28
|/ / /
* | | Merge pull request #18344 from jonatack/patch-1Rafael Mendonça França2015-01-051-5/+5
|\ \ \ | | | | | | | | Clean up secure_token_test
| * | | Clean up secure_token_testJon Atack2015-01-051-5/+5
| | | |
* | | | Merge pull request #18345 from mtthgn/patch-1Rafael Mendonça França2015-01-051-1/+1
|\ \ \ \ | |/ / / |/| | | Fix TypeError in Fixture creation
| * | | Fix TypeError in Fixture creationMatt Hogan2015-01-051-1/+1
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ruby 4.2 started doing `value.gsub('$LABEL', label)` for fixture label interpolation, but you can have have valid YAML where `label` isn't a String. For example: ```YAML 0: name: John email: johndoe@gmail.com 1: name: Jane email: janedoe@gmail.com ``` This YAML will create a label that is a Fixnum, causing `TypeError: no implicit conversion of Fixnum into String.`
* | | reflects changes in 34cd7e2 in the index [ci skip]Xavier Noria2015-01-051-3/+3
| | |
* | | Merge pull request #18341 from aditya-kapoor/remove-unneeded-checksRafael Mendonça França2015-01-051-2/+1
|\ \ \ | | | | | | | | remove unneeded check since /_one_time_conditions/ is not present anymore.
| * | | remove unneeded check since /_one_time_conditions/ is removedAditya Kapoor2015-01-051-2/+1
| | | |
* | | | Merge pull request #18342 from ↵Rafael Mendonça França2015-01-051-2/+4
|\ \ \ \ | |/ / / |/| | | | | | | | | | | brainopia/reset_template_assertion_without_warnings Reset template assertions without warnings
| * | | Reset template assertions without warningsbrainopia2015-01-051-2/+4
|/ / /
* | | Fix typo in changelog [ci skip]Carlos Antonio da Silva2015-01-051-1/+1
| | |
* | | remove deprecated support to preload instance-dependent associaitons.Yves Senn2015-01-054-32/+16
| | | | | | | | | | | | Addresses https://github.com/rails/rails/commit/ed56e596a0467390011bc9d56d462539776adac1#commitcomment-9145960
* | | remove deprecated support for PG ranges with exclusive lower bounds.Yves Senn2015-01-053-37/+10
| | | | | | | | | | | | addresses https://github.com/rails/rails/commit/91949e48cf41af9f3e4ffba3e5eecf9b0a08bfc3#commitcomment-9144563
* | | can't kill thread with in-memory db. fixes `rake test:sqlite3_mem`.Yves Senn2015-01-051-0/+2
| | |
* | | remove deprecation warning when modifying a Relation with cached arel.Yves Senn2015-01-053-21/+27
| | | | | | | | | | | | This adresses https://github.com/rails/rails/commit/1b7aa62b184c4410c99208f71b59bbac5c5f03be#commitcomment-9147803
* | | add punctuation. [ci skip]Yves Senn2015-01-051-2/+2
| | |
* | | Merge pull request #18332 from gchan/update-adequate-record-notesRafael Mendonça França2015-01-041-0/+3
|\ \ \ | | | | | | | | Include newer `find_by` syntax example in 4.2 release notes for Adequate Record
| * | | [guides] Added newer find_by syntax example in 4.2 release notes for ↵Gordon Chan2015-01-051-0/+3
| | | | | | | | | | | | | | | | Adequate Record [skip ci]
* | | | Merge pull request #18331 from simi/document-protect-from-forgery-optionsDavid Heinemeier Hansson2015-01-041-8/+2
|\ \ \ \ | |/ / / |/| | | Document all options for protect_from_forgery.
| * | | Document all options for protect_from_forgery.Josef Šimánek2015-01-041-8/+2
|/ / / | | | | | | | | | [ci skip]
* | | Merge pull request #18090 from egilburg/patch-3Rafael Mendonça França2015-01-041-9/+1
|\ \ \ | | | | | | | | | | | | simplify ActiveSupport.test_order definition
| * | | simplify ActiveSupport.test_order definitionEugene Gilburg2014-12-181-9/+2
| | | |
* | | | Do not include Active Support on testsRafael Mendonça França2015-01-043-30/+24
| | | | | | | | | | | | | | | | It was not done to be included
* | | | Merge pull request #18328 from brainopia/remove_tz_proxyRafael Mendonça França2015-01-043-12/+7
|\ \ \ \ | | | | | | | | | | Use directly TZInfo::Timezone without proxy
| * | | | Use directly TZInfo::Timezone without proxybrainopia2015-01-043-12/+7
| | | | | | | | | | | | | | | | | | | | | | | | | Since real timezone is loaded anyway in `#utc_offset` which is called during `#create`
* | | | | Remove unused requireCarlos Antonio da Silva2015-01-041-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | This was used by the respond_to/respond_with implementation on this file, which is now extracted to the responders gem.
* | | | | Remove respond_to/respond_with placeholder methodsCarlos Antonio da Silva2015-01-043-52/+5
| | | | | | | | | | | | | | | | | | | | This functionality has been extracted to the responders gem.
* | | | | Remove extra class_eval for Ruby 1.9Carlos Antonio da Silva2015-01-041-5/+2
| | | | |
* | | | | Remove workaround to a Ruby 2.0.0 bugRafael Mendonça França2015-01-041-7/+0
| | | | |
* | | | | Remove Struct#to_h backportRafael Mendonça França2015-01-044-18/+5
| | | | |
* | | | | String already respond_to scrub at Ruby 2.2Rafael Mendonça França2015-01-041-2/+1
| | | | |
* | | | | singleton_class? is already pressent at Ruby 2.2Rafael Mendonça França2015-01-041-8/+0
| | | | |
* | | | | Remove unneeded Time patch to support Ruby 1.9Rafael Mendonça França2015-01-042-30/+2
| | | | |
* | | | | Remove some comments about Ruby 1.9 behaviorsRafael Mendonça França2015-01-046-9/+9
| | | | |
* | | | | Remove wrong TODO commentRafael Mendonça França2015-01-041-1/+1
| | | | |
* | | | | No need to disable sidikiq tests with 1.9.3 anymoreRafael Mendonça França2015-01-041-11/+0
| | | | |
* | | | | Remove debugger supportRafael Mendonça França2015-01-0414-138/+8
| | | | | | | | | | | | | | | | | | | | | | | | | bebugger doesn't work with Ruby 2.2 so we don't need to support it anymore
* | | | | Remove version conditional for calling GC.disableRafael Mendonça França2015-01-041-1/+1
| | | | |
* | | | | Remove version conditional for find_template_pathsRafael Mendonça França2015-01-041-18/+6
| | | | | | | | | | | | | | | | | | | | | | | | | Now that we only support Ruby 2.2+ we don't need this conditional anymore
* | | | | Remove LoadError#path hack for Ruby 1.9claudiob2015-01-041-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | Now that Rails requires Ruby >= 2.0 there is need to skip the `test_depend_on_path` test.
* | | | | Remove Thread hack for Ruby 1.9claudiob2015-01-041-23/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The hack so skip a Thread test for Ruby 1.9 can be removed now that Rails requires Ruby >= 2.0. Conflicts: activerecord/test/cases/transactions_test.rb
* | | | | Remove Psych hack for Ruby 1.9claudiob2015-01-041-10/+1
| | | | | | | | | | | | | | | | | | | | | | | | | A special `if` statement to support `Psych` for Ruby < 2.0 can be dropped now that Rails requires Ruby >= 2.0.