From 6f084405384aeda51f56d34e74daa7ab040fb4f1 Mon Sep 17 00:00:00 2001 From: Jeremy Kemper Date: Sat, 28 Mar 2009 23:52:46 -0700 Subject: Explicit dependency on Hash#deep_merge extension --- activesupport/lib/active_support/option_merger.rb | 2 ++ 1 file changed, 2 insertions(+) (limited to 'activesupport/lib/active_support') 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| -- cgit v1.2.3