diff options
| author | Roque Pinel <repinel@gmail.com> | 2015-08-12 20:49:23 -0400 |
|---|---|---|
| committer | Roque Pinel <repinel@gmail.com> | 2015-09-22 22:32:56 -0400 |
| commit | 35cd3656218f800aaf2500c23945cf7fe084d1a7 (patch) | |
| tree | 39e98c98fd29286651061ad6f6858081a9a0ce4c /activemodel/lib | |
| parent | eb52c8979b4e8023f8415e5f8a568e8933ecbd38 (diff) | |
| download | rails-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 'activemodel/lib')
| -rw-r--r-- | activemodel/lib/active_model/callbacks.rb | 1 | ||||
| -rw-r--r-- | activemodel/lib/active_model/validations/callbacks.rb | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/activemodel/lib/active_model/callbacks.rb b/activemodel/lib/active_model/callbacks.rb index 2cf39b68fb..0d6a3dc52d 100644 --- a/activemodel/lib/active_model/callbacks.rb +++ b/activemodel/lib/active_model/callbacks.rb @@ -103,6 +103,7 @@ module ActiveModel def define_model_callbacks(*callbacks) options = callbacks.extract_options! options = { + terminator: deprecated_false_terminator, skip_after_callbacks_if_terminated: true, scope: [:kind, :name], only: [:before, :around, :after] diff --git a/activemodel/lib/active_model/validations/callbacks.rb b/activemodel/lib/active_model/validations/callbacks.rb index 4b58ef66e3..52111e5442 100644 --- a/activemodel/lib/active_model/validations/callbacks.rb +++ b/activemodel/lib/active_model/validations/callbacks.rb @@ -23,6 +23,7 @@ module ActiveModel included do include ActiveSupport::Callbacks define_callbacks :validation, + terminator: deprecated_false_terminator, skip_after_callbacks_if_terminated: true, scope: [:kind, :name] end |