diff options
author | David Heinemeier Hansson <david@loudthinking.com> | 2009-12-31 01:15:30 -0500 |
---|---|---|
committer | David Heinemeier Hansson <david@loudthinking.com> | 2009-12-31 01:15:30 -0500 |
commit | 96c27e4003b803b9ac1a3581dfe1c181ba79556a (patch) | |
tree | 24a6c8573dfe3aa01abd4464eafbeb86e96cd250 /railties/lib/rails/configuration.rb | |
parent | 5d8342cc325bc9f46bfe61bf3534248b6ad3216f (diff) | |
parent | c4c2502df8b0b7b5fa28d796bdb1d4bd02af4b3d (diff) | |
download | rails-96c27e4003b803b9ac1a3581dfe1c181ba79556a.tar.gz rails-96c27e4003b803b9ac1a3581dfe1c181ba79556a.tar.bz2 rails-96c27e4003b803b9ac1a3581dfe1c181ba79556a.zip |
Merge branch 'master' of github.com:rails/rails
Diffstat (limited to 'railties/lib/rails/configuration.rb')
-rw-r--r-- | railties/lib/rails/configuration.rb | 20 |
1 files changed, 1 insertions, 19 deletions
diff --git a/railties/lib/rails/configuration.rb b/railties/lib/rails/configuration.rb index cb321536d2..086f67a419 100644 --- a/railties/lib/rails/configuration.rb +++ b/railties/lib/rails/configuration.rb @@ -1,24 +1,6 @@ require 'active_support/ordered_options' module Rails - # Create a Plugin::Options from ActiveSuppot::OrderedOptions, - # which support the following syntax: - # - # controller.action_controller.include FooBar - # - class Plugin::Options < ActiveSupport::OrderedOptions #:nodoc: - attr_reader :includes - - def initialize(*args) - @includes = [] - super - end - - def include(*args) - @includes.concat(args) - end - end - # Temporarily separate the plugin configuration class from the main # configuration class while this bit is being cleaned up. class Plugin::Configuration @@ -34,7 +16,7 @@ module Rails @options = base.options.dup @middleware = base.middleware.dup else - @options = Hash.new { |h,k| h[k] = Rails::Plugin::Options.new } + @options = Hash.new { |h,k| h[k] = ActiveSupport::OrderedOptions.new } @middleware = ActionDispatch::MiddlewareStack.new end end |