diff options
author | Jeremy Kemper <jeremy@bitsweat.net> | 2010-01-31 18:32:28 -0800 |
---|---|---|
committer | Jeremy Kemper <jeremy@bitsweat.net> | 2010-02-01 02:02:42 -0800 |
commit | e5ab4b0d07ade8d89d633ca744c0eafbc53ee921 (patch) | |
tree | aa2480b38f79e623b98da0274695f99db73bff20 /actionpack/lib/action_controller/metal.rb | |
parent | 8ae25a8e41168801590fdb95891cc5990b4db21c (diff) | |
download | rails-e5ab4b0d07ade8d89d633ca744c0eafbc53ee921.tar.gz rails-e5ab4b0d07ade8d89d633ca744c0eafbc53ee921.tar.bz2 rails-e5ab4b0d07ade8d89d633ca744c0eafbc53ee921.zip |
Convert to class_attribute
Diffstat (limited to 'actionpack/lib/action_controller/metal.rb')
-rw-r--r-- | actionpack/lib/action_controller/metal.rb | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/actionpack/lib/action_controller/metal.rb b/actionpack/lib/action_controller/metal.rb index 57627a6f0b..2b35e111ec 100644 --- a/actionpack/lib/action_controller/metal.rb +++ b/actionpack/lib/action_controller/metal.rb @@ -1,4 +1,4 @@ -require 'active_support/core_ext/class/inheritable_attributes' +require 'active_support/core_ext/class/attribute' module ActionController # ActionController::Metal provides a way to get a valid Rack application from a controller. @@ -90,7 +90,12 @@ module ActionController end end - extlib_inheritable_accessor(:middleware_stack) { ActionDispatch::MiddlewareStack.new } + class_attribute :middleware_stack + self.middleware_stack = ActionDispatch::MiddlewareStack.new + + def self.inherited(base) + self.middleware_stack = base.middleware_stack.dup + end def self.use(*args) middleware_stack.use(*args) |