aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/lib
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2013-05-15 09:40:58 -0700
committerAaron Patterson <aaron.patterson@gmail.com>2013-05-15 09:40:58 -0700
commit1012c3e9699471248f8554d4d5bf18e7d194ac2b (patch)
tree7d09d1c25b1aa972516350c0579b31a10baf70da /activesupport/lib
parentdb78643a17af9475fde2a6730e9e9e9fc3d77ad2 (diff)
downloadrails-1012c3e9699471248f8554d4d5bf18e7d194ac2b.tar.gz
rails-1012c3e9699471248f8554d4d5bf18e7d194ac2b.tar.bz2
rails-1012c3e9699471248f8554d4d5bf18e7d194ac2b.zip
remove deprecation notices
Diffstat (limited to 'activesupport/lib')
-rw-r--r--activesupport/lib/active_support/callbacks.rb10
1 files changed, 0 insertions, 10 deletions
diff --git a/activesupport/lib/active_support/callbacks.rb b/activesupport/lib/active_support/callbacks.rb
index 1a830c03b8..296de94e91 100644
--- a/activesupport/lib/active_support/callbacks.rb
+++ b/activesupport/lib/active_support/callbacks.rb
@@ -341,27 +341,17 @@ module ActiveSupport
@key = compute_identifier filter
@if = Array(options[:if])
@unless = Array(options[:unless])
-
- deprecate_per_key_option(options)
end
def filter; @key; end
def raw_filter; @filter; end
- def deprecate_per_key_option(options)
- if options[:per_key]
- raise NotImplementedError, ":per_key option is no longer supported. Use generic :if and :unless options instead."
- end
- end
-
def merge(chain, new_options)
_options = {
:if => @if.dup,
:unless => @unless.dup
}
- deprecate_per_key_option new_options
-
_options[:if].concat Array(new_options.fetch(:unless, []))
_options[:unless].concat Array(new_options.fetch(:if, []))