aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/lib/active_support.rb
diff options
context:
space:
mode:
authorSam Stephenson <sam@37signals.com>2005-12-15 20:03:23 +0000
committerSam Stephenson <sam@37signals.com>2005-12-15 20:03:23 +0000
commit85fe1ecaefe415ac1de36883f5f6162f49bd5287 (patch)
tree34f87cac51f7009928bc6ba0604cddf62be01d3e /activesupport/lib/active_support.rb
parentfc4ffbdc69988b60bd17ffab5d8d81ec67a11180 (diff)
downloadrails-85fe1ecaefe415ac1de36883f5f6162f49bd5287.tar.gz
rails-85fe1ecaefe415ac1de36883f5f6162f49bd5287.tar.bz2
rails-85fe1ecaefe415ac1de36883f5f6162f49bd5287.zip
Add Object#with_options for DRYing up multiple calls to methods having shared options
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3314 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activesupport/lib/active_support.rb')
-rw-r--r--activesupport/lib/active_support.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/activesupport/lib/active_support.rb b/activesupport/lib/active_support.rb
index 7d5440f2a8..1cace11e9b 100644
--- a/activesupport/lib/active_support.rb
+++ b/activesupport/lib/active_support.rb
@@ -32,5 +32,6 @@ require 'active_support/clean_logger'
require 'active_support/dependencies'
require 'active_support/ordered_options'
+require 'active_support/option_merger'
require 'active_support/values/time_zone' \ No newline at end of file