Permalink
Browse files

fix deprecation test

  • Loading branch information...
1 parent 929658c commit f0a9f814a3ea7237275b2c89df8b378b08e248f8 @tenderlove tenderlove committed May 10, 2013
Showing with 2 additions and 0 deletions.
  1. +2 −0 activesupport/lib/active_support/callbacks.rb
@@ -126,6 +126,8 @@ def merge(chain, new_options)
:unless => @options[:unless].dup
}
+ deprecate_per_key_option new_options
+
_options[:if].concat Array(new_options.fetch(:unless, []))
_options[:unless].concat Array(new_options.fetch(:if, []))

0 comments on commit f0a9f81

Please sign in to comment.