mirror of
https://github.com/rails/rails.git
synced 2022-11-09 12:12:34 -05:00
change merge to merge!
This commit is contained in:
parent
8db99d3be8
commit
bd674fd4e5
2 changed files with 2 additions and 2 deletions
activesupport/lib/active_support
|
@ -315,7 +315,7 @@ module ActiveSupport
|
|||
@config = {
|
||||
:terminator => "false",
|
||||
:scope => [ :kind ]
|
||||
}.merge(config)
|
||||
}.merge!(config)
|
||||
end
|
||||
|
||||
def compile
|
||||
|
|
|
@ -78,7 +78,7 @@ module ActiveSupport
|
|||
end
|
||||
|
||||
def self.[](*args)
|
||||
new.merge(Hash[*args])
|
||||
new.merge!(Hash[*args])
|
||||
end
|
||||
|
||||
alias_method :regular_writer, :[]= unless method_defined?(:regular_writer)
|
||||
|
|
Loading…
Reference in a new issue