kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

change merge to merge!

Browse source
This commit is contained in:
Vipul A M 2013-03-29 20:58:46 +05:30
parent 8db99d3be8
commit bd674fd4e5
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
activesupport/lib/active_support/callbacks.rb
View file

@ -315,7 +315,7 @@ module ActiveSupport
@config = {
:terminator => "false",
:scope => [ :kind ]
}.merge(config)
}.merge!(config)
end
def compile

2
activesupport/lib/active_support/hash_with_indifferent_access.rb
View file

@ -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)