aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record
diff options
context:
space:
mode:
authorRoque Pinel <repinel@gmail.com>2015-08-12 20:49:23 -0400
committerRoque Pinel <repinel@gmail.com>2015-09-22 22:32:56 -0400
commit35cd3656218f800aaf2500c23945cf7fe084d1a7 (patch)
tree39e98c98fd29286651061ad6f6858081a9a0ce4c /activerecord/lib/active_record
parenteb52c8979b4e8023f8415e5f8a568e8933ecbd38 (diff)
downloadrails-35cd3656218f800aaf2500c23945cf7fe084d1a7.tar.gz
rails-35cd3656218f800aaf2500c23945cf7fe084d1a7.tar.bz2
rails-35cd3656218f800aaf2500c23945cf7fe084d1a7.zip
Fix the AS::Callbacks terminator regression from 4.2.3
Rails 4.2.3 AS::Callbacks will not halt chain if `false` is returned. That is the behavior of specific callbacks like AR::Callbacks and AM::Callbacks.
Diffstat (limited to 'activerecord/lib/active_record')
-rw-r--r--activerecord/lib/active_record/transactions.rb1
1 files changed, 1 insertions, 0 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