diff options
| author | Vipul A M <vipulnsward@gmail.com> | 2013-03-29 20:58:46 +0530 |
|---|---|---|
| committer | Vipul A M <vipulnsward@gmail.com> | 2013-03-29 20:58:46 +0530 |
| commit | bd674fd4e58387c331a7608bbfd48a690471c556 (patch) | |
| tree | 369b6a9ac5c91774f1770102bb1768687b9daf41 | |
| parent | 8db99d3be8089fadabc9fe0848541f601438b401 (diff) | |
| download | rails-bd674fd4e58387c331a7608bbfd48a690471c556.tar.gz rails-bd674fd4e58387c331a7608bbfd48a690471c556.tar.bz2 rails-bd674fd4e58387c331a7608bbfd48a690471c556.zip | |
change merge to merge!
| -rw-r--r-- | activesupport/lib/active_support/callbacks.rb | 2 | ||||
| -rw-r--r-- | activesupport/lib/active_support/hash_with_indifferent_access.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/activesupport/lib/active_support/callbacks.rb b/activesupport/lib/active_support/callbacks.rb index f2d9df6d13..6c0cae71ed 100644 --- a/activesupport/lib/active_support/callbacks.rb +++ b/activesupport/lib/active_support/callbacks.rb @@ -315,7 +315,7 @@ module ActiveSupport @config = { :terminator => "false", :scope => [ :kind ] - }.merge(config) + }.merge!(config) end def compile diff --git a/activesupport/lib/active_support/hash_with_indifferent_access.rb b/activesupport/lib/active_support/hash_with_indifferent_access.rb index 306d80b2df..837db05dcc 100644 --- a/activesupport/lib/active_support/hash_with_indifferent_access.rb +++ b/activesupport/lib/active_support/hash_with_indifferent_access.rb @@ -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) |