aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2017-10-19 16:22:41 -0400
committerRafael Mendonça França <rafaelmfranca@gmail.com>2017-10-23 12:51:05 -0400
commit19fbbebb1665e482d76cae30166b46e74ceafe29 (patch)
treedc5fae987ab5c32b3455eb379f61cd17098ea27b
parentc792354adcbf8c966f274915c605c6713b840548 (diff)
downloadrails-19fbbebb1665e482d76cae30166b46e74ceafe29.tar.gz
rails-19fbbebb1665e482d76cae30166b46e74ceafe29.tar.bz2
rails-19fbbebb1665e482d76cae30166b46e74ceafe29.zip
Remove deprecated `halt_callback_chains_on_return_false` option
-rw-r--r--activesupport/CHANGELOG.md4
-rw-r--r--activesupport/lib/active_support.rb12
2 files changed, 4 insertions, 12 deletions
diff --git a/activesupport/CHANGELOG.md b/activesupport/CHANGELOG.md
index 387eb4cbb3..f57b9ce5ab 100644
--- a/activesupport/CHANGELOG.md
+++ b/activesupport/CHANGELOG.md
@@ -1,3 +1,7 @@
+* Remove deprecated `halt_callback_chains_on_return_false` option.
+
+ *Rafael Mendonça França*
+
* Remove deprecated `:if` and `:unless` string filter for callbacks.
*Rafael Mendonça França*
diff --git a/activesupport/lib/active_support.rb b/activesupport/lib/active_support.rb
index c75b5d630c..68be94f99d 100644
--- a/activesupport/lib/active_support.rb
+++ b/activesupport/lib/active_support.rb
@@ -82,18 +82,6 @@ module ActiveSupport
cattr_accessor :test_order # :nodoc:
- def self.halt_callback_chains_on_return_false
- ActiveSupport::Deprecation.warn(<<-MSG.squish)
- ActiveSupport.halt_callback_chains_on_return_false is deprecated and will be removed in Rails 5.2.
- MSG
- end
-
- def self.halt_callback_chains_on_return_false=(value)
- ActiveSupport::Deprecation.warn(<<-MSG.squish)
- ActiveSupport.halt_callback_chains_on_return_false= is deprecated and will be removed in Rails 5.2.
- MSG
- end
-
def self.to_time_preserves_timezone
DateAndTime::Compatibility.preserve_timezone
end