TEST_CODEOWNERS/rails
3
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Callback#merge merges options for a callback skip instead of a callback. Renamed it to indicate what it actually does.

Browse Source
This commit is contained in:
Vipul A M 2015-01-31 12:24:44 +05:30
parent b93b39eff6
commit 0928c3f294
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
activesupport/lib/active_support/callbacks.rb
View File

@ -373,7 +373,7 @@ def initialize(name, filter, kind, options, chain_config)
def filter; @key; end def filter; @key; end
def raw_filter; @filter; end def raw_filter; @filter; end
def merge(chain, new_options) def merge_conditional_options(chain, new_options)
options = { options = {
:if => @if.dup, :if => @if.dup,
:unless => @unless.dup :unless => @unless.dup
@ -701,7 +701,7 @@ def skip_callback(name, *filter_list, &block)
filter = chain.find {|c| c.matches?(type, filter) } filter = chain.find {|c| c.matches?(type, filter) }
if filter && options.any? 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) chain.insert(chain.index(filter), new_filter)
end end