diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2009-04-22 17:41:28 -0700 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2009-04-22 18:54:13 -0700 |
| commit | f28bd9557c669cd63c31704202a46dd83f0a4102 (patch) | |
| tree | 4ec4423cfbcc9414982e0e72adda354c69cce541 /activesupport/lib/active_support/core_ext/hash | |
| parent | 5c4ba6e3fc66a779c28a70b8d7bde14b49e7c36c (diff) | |
| download | rails-f28bd9557c669cd63c31704202a46dd83f0a4102.tar.gz rails-f28bd9557c669cd63c31704202a46dd83f0a4102.tar.bz2 rails-f28bd9557c669cd63c31704202a46dd83f0a4102.zip | |
Fix dependencies revealed by testing in isolation
Diffstat (limited to 'activesupport/lib/active_support/core_ext/hash')
| -rw-r--r-- | activesupport/lib/active_support/core_ext/hash/conversions.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/activesupport/lib/active_support/core_ext/hash/conversions.rb b/activesupport/lib/active_support/core_ext/hash/conversions.rb index fa171720f9..f9dddec687 100644 --- a/activesupport/lib/active_support/core_ext/hash/conversions.rb +++ b/activesupport/lib/active_support/core_ext/hash/conversions.rb @@ -1,6 +1,8 @@ require 'date' require 'active_support/core_ext/object/conversions' require 'active_support/core_ext/array/conversions' +require 'active_support/core_ext/hash/reverse_merge' +require 'active_support/core/time' class Hash # This module exists to decorate files deserialized using Hash.from_xml with |