diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2009-03-28 23:52:46 -0700 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2009-03-28 23:52:46 -0700 |
| commit | 6f084405384aeda51f56d34e74daa7ab040fb4f1 (patch) | |
| tree | b6b410410155842cb33edfd714f6f1a2217fb225 /activesupport/lib/active_support/option_merger.rb | |
| parent | cb5b2ca5c1151d8e492144f66c3c330160e90b4f (diff) | |
| download | rails-6f084405384aeda51f56d34e74daa7ab040fb4f1.tar.gz rails-6f084405384aeda51f56d34e74daa7ab040fb4f1.tar.bz2 rails-6f084405384aeda51f56d34e74daa7ab040fb4f1.zip | |
Explicit dependency on Hash#deep_merge extension
Diffstat (limited to 'activesupport/lib/active_support/option_merger.rb')
| -rw-r--r-- | activesupport/lib/active_support/option_merger.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/activesupport/lib/active_support/option_merger.rb b/activesupport/lib/active_support/option_merger.rb index 63662b75c7..e55ffd12c3 100644 --- a/activesupport/lib/active_support/option_merger.rb +++ b/activesupport/lib/active_support/option_merger.rb @@ -1,3 +1,5 @@ +require 'active_support/core_ext/hash/deep_merge' + module ActiveSupport class OptionMerger #:nodoc: instance_methods.each do |method| |