diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2015-02-05 17:48:54 -0200 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2015-02-05 17:48:54 -0200 |
| commit | 459a9ea47fdcdb16dbcf6bd98e54a2fda5a16e39 (patch) | |
| tree | 59e5abf1d9e946efaada9a27a9cc600361e211e4 /activesupport/lib/active_support | |
| parent | 9ec973f0ac5148998278b2f435b53d0536ceff63 (diff) | |
| parent | 0928c3f2945339437eda2d555d2846b02f06950f (diff) | |
| download | rails-459a9ea47fdcdb16dbcf6bd98e54a2fda5a16e39.tar.gz rails-459a9ea47fdcdb16dbcf6bd98e54a2fda5a16e39.tar.bz2 rails-459a9ea47fdcdb16dbcf6bd98e54a2fda5a16e39.zip | |
Merge pull request #18747 from vipulnsward/merge-skip-callback
Rename AS::Callback#merge
Diffstat (limited to 'activesupport/lib/active_support')
| -rw-r--r-- | activesupport/lib/active_support/callbacks.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/activesupport/lib/active_support/callbacks.rb b/activesupport/lib/active_support/callbacks.rb index 0f1de8b076..98b8f0d34a 100644 --- a/activesupport/lib/active_support/callbacks.rb +++ b/activesupport/lib/active_support/callbacks.rb @@ -373,7 +373,7 @@ module ActiveSupport def filter; @key; end def raw_filter; @filter; end - def merge(chain, new_options) + def merge_conditional_options(chain, new_options) options = { :if => @if.dup, :unless => @unless.dup @@ -701,7 +701,7 @@ module ActiveSupport filter = chain.find {|c| c.matches?(type, filter) } if filter && options.any? - new_filter = filter.merge(chain, options) + new_filter = filter.merge_conditional_options(chain, options) chain.insert(chain.index(filter), new_filter) end |