diff options
| author | Lawrence Pit <lawrence.pit@gmail.com> | 2008-07-14 11:53:41 +1000 |
|---|---|---|
| committer | Pratik Naik <pratiknaik@gmail.com> | 2008-07-17 01:59:08 +0100 |
| commit | 40dbebba28bfa1c55737da7354542c3bdca4e1a1 (patch) | |
| tree | f21c9a31379dae25b5cedae5ea00053a272d9408 /activesupport/lib/active_support/core_ext/hash.rb | |
| parent | cd6301557005617583e3f9ca5fb56297adcce7cc (diff) | |
| download | rails-40dbebba28bfa1c55737da7354542c3bdca4e1a1.tar.gz rails-40dbebba28bfa1c55737da7354542c3bdca4e1a1.tar.bz2 rails-40dbebba28bfa1c55737da7354542c3bdca4e1a1.zip | |
Allow deep merging of hash values for nested with_options. [#490 state:resolved]
Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
Diffstat (limited to 'activesupport/lib/active_support/core_ext/hash.rb')
| -rw-r--r-- | activesupport/lib/active_support/core_ext/hash.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/activesupport/lib/active_support/core_ext/hash.rb b/activesupport/lib/active_support/core_ext/hash.rb index 6cbd9dd378..a6065ab48e 100644 --- a/activesupport/lib/active_support/core_ext/hash.rb +++ b/activesupport/lib/active_support/core_ext/hash.rb @@ -1,10 +1,11 @@ -%w(keys indifferent_access reverse_merge conversions diff slice except).each do |ext| +%w(keys indifferent_access deep_merge reverse_merge conversions diff slice except).each do |ext| require "active_support/core_ext/hash/#{ext}" end class Hash #:nodoc: include ActiveSupport::CoreExtensions::Hash::Keys include ActiveSupport::CoreExtensions::Hash::IndifferentAccess + include ActiveSupport::CoreExtensions::Hash::DeepMerge include ActiveSupport::CoreExtensions::Hash::ReverseMerge include ActiveSupport::CoreExtensions::Hash::Conversions include ActiveSupport::CoreExtensions::Hash::Diff |