diff options
| author | Kasper Timm Hansen <kaspth@gmail.com> | 2015-09-23 22:18:33 +0200 |
|---|---|---|
| committer | Kasper Timm Hansen <kaspth@gmail.com> | 2015-09-23 22:18:33 +0200 |
| commit | 9c55ff564d21c178979cab126258123fa4b8b52a (patch) | |
| tree | c9230df89d2bc89a85e27faecec32ff3971c3398 /activerecord | |
| parent | 262f92364b8d3e4eddb490bcb8b31c0ca9b934f9 (diff) | |
| parent | 35cd3656218f800aaf2500c23945cf7fe084d1a7 (diff) | |
| download | rails-9c55ff564d21c178979cab126258123fa4b8b52a.tar.gz rails-9c55ff564d21c178979cab126258123fa4b8b52a.tar.bz2 rails-9c55ff564d21c178979cab126258123fa4b8b52a.zip | |
Merge pull request #21218 from repinel/fix-as-callback-terminator
WIP: Fix the AS::Callbacks terminator regression from 4.2.3
Diffstat (limited to 'activerecord')
| -rw-r--r-- | activerecord/lib/active_record/transactions.rb | 1 | ||||
| -rw-r--r-- | activerecord/test/cases/attribute_test.rb | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/transactions.rb b/activerecord/lib/active_record/transactions.rb index 4a569fc242..1a2988ea77 100644 --- a/activerecord/lib/active_record/transactions.rb +++ b/activerecord/lib/active_record/transactions.rb @@ -11,6 +11,7 @@ module ActiveRecord :before_commit_without_transaction_enrollment, :commit_without_transaction_enrollment, :rollback_without_transaction_enrollment, + terminator: deprecated_false_terminator, scope: [:kind, :name] end diff --git a/activerecord/test/cases/attribute_test.rb b/activerecord/test/cases/attribute_test.rb index 0ec368f51d..c69782d93f 100644 --- a/activerecord/test/cases/attribute_test.rb +++ b/activerecord/test/cases/attribute_test.rb @@ -4,7 +4,6 @@ module ActiveRecord class AttributeTest < ActiveRecord::TestCase setup do @type = Minitest::Mock.new - @type.expect(:==, false, [false]) end teardown do |