aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails/railtie
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@gmail.com>2010-05-16 12:03:11 +0200
committerJosé Valim <jose.valim@gmail.com>2010-05-16 12:03:11 +0200
commit99b38f371a17eb3965f794227279e89fb6c694a6 (patch)
tree303a30fc7ccb96065b53572042526e7a1e874089 /railties/lib/rails/railtie
parent4750e61bfecd210e5c4d96546d638b5cd23bb09e (diff)
downloadrails-99b38f371a17eb3965f794227279e89fb6c694a6.tar.gz
rails-99b38f371a17eb3965f794227279e89fb6c694a6.tar.bz2
rails-99b38f371a17eb3965f794227279e89fb6c694a6.zip
Move AD::Cascade to the bottom of the middleware stack.
Diffstat (limited to 'railties/lib/rails/railtie')
-rw-r--r--railties/lib/rails/railtie/configuration.rb33
1 files changed, 1 insertions, 32 deletions
diff --git a/railties/lib/rails/railtie/configuration.rb b/railties/lib/rails/railtie/configuration.rb
index c4a315708b..4e6f94c534 100644
--- a/railties/lib/rails/railtie/configuration.rb
+++ b/railties/lib/rails/railtie/configuration.rb
@@ -3,37 +3,6 @@ require 'rails/configuration'
module Rails
class Railtie
class Configuration
- class MiddlewareStackProxy
- def initialize
- @operations = []
- end
-
- def insert_before(*args, &block)
- @operations << [:insert_before, args, block]
- end
-
- alias insert insert_before
-
- def insert_after(*args, &block)
- @operations << [:insert_after, args, block]
- end
-
- def swap(*args, &block)
- @operations << [:swap, args, block]
- end
-
- def use(*args, &block)
- @operations << [:use, args, block]
- end
-
- def merge_into(other)
- @operations.each do |operation, args, block|
- other.send(operation, *args, &block)
- end
- other
- end
- end
-
def initialize
@@options ||= {}
end
@@ -44,7 +13,7 @@ module Rails
# application once it is defined and the default_middlewares are
# created
def app_middleware
- @@app_middleware ||= MiddlewareStackProxy.new
+ @@app_middleware ||= Rails::Configuration::MiddlewareStackProxy.new
end
# Holds generators configuration: