Permalink
Browse files

change merge to merge!

  • Loading branch information...
1 parent 8db99d3 commit bd674fd4e58387c331a7608bbfd48a690471c556 @vipulnsward vipulnsward committed Mar 29, 2013
View
2 activesupport/lib/active_support/callbacks.rb
@@ -315,7 +315,7 @@ def initialize(name, config)
@config = {
:terminator => "false",
:scope => [ :kind ]
- }.merge(config)
+ }.merge!(config)
end
def compile
View
2 activesupport/lib/active_support/hash_with_indifferent_access.rb
@@ -78,7 +78,7 @@ def self.new_from_hash_copying_default(hash)
end
def self.[](*args)
- new.merge(Hash[*args])
+ new.merge!(Hash[*args])
end
alias_method :regular_writer, :[]= unless method_defined?(:regular_writer)

0 comments on commit bd674fd

Please sign in to comment.