aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport
diff options
context:
space:
mode:
authorCarlos Antonio da Silva <carlosantoniodasilva@gmail.com>2010-05-15 09:12:55 -0300
committerJosé Valim <jose.valim@gmail.com>2010-05-15 14:54:07 +0200
commitc77794a924938360bf4e61c9a13cdbe5b58fdf62 (patch)
tree90b388e4d1c9f54d2e35c001005d2c3f82c29a8e /activesupport
parent58adc6737126242d189274d83c50bcade098800a (diff)
downloadrails-c77794a924938360bf4e61c9a13cdbe5b58fdf62.tar.gz
rails-c77794a924938360bf4e61c9a13cdbe5b58fdf62.tar.bz2
rails-c77794a924938360bf4e61c9a13cdbe5b58fdf62.zip
Add missing require to with_options [#4601 state:resolved]
Signed-off-by: José Valim <jose.valim@gmail.com>
Diffstat (limited to 'activesupport')
-rw-r--r--activesupport/lib/active_support/core_ext/object/with_options.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/activesupport/lib/active_support/core_ext/object/with_options.rb b/activesupport/lib/active_support/core_ext/object/with_options.rb
index dd38b7d261..3209cf7f11 100644
--- a/activesupport/lib/active_support/core_ext/object/with_options.rb
+++ b/activesupport/lib/active_support/core_ext/object/with_options.rb
@@ -1,3 +1,5 @@
+require 'active_support/option_merger'
+
class Object
# An elegant way to factor duplication out of options passed to a series of
# method calls. Each method called in the block, with the block variable as