aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails/configuration.rb
diff options
context:
space:
mode:
authorJoshua Peek <josh@joshpeek.com>2009-09-26 21:07:49 -0500
committerJoshua Peek <josh@joshpeek.com>2009-09-26 21:07:49 -0500
commitb0506b086fa1b59b072aaf7de99f01846fce10a4 (patch)
tree4beaa3d92a061df6ca0b5859c69fa64dcbe4f19c /railties/lib/rails/configuration.rb
parentacfeec515111d427b3a27aef3af034922e0d9248 (diff)
downloadrails-b0506b086fa1b59b072aaf7de99f01846fce10a4.tar.gz
rails-b0506b086fa1b59b072aaf7de99f01846fce10a4.tar.bz2
rails-b0506b086fa1b59b072aaf7de99f01846fce10a4.zip
Create separate middleware stack for initializer
Diffstat (limited to 'railties/lib/rails/configuration.rb')
-rw-r--r--railties/lib/rails/configuration.rb5
1 files changed, 2 insertions, 3 deletions
diff --git a/railties/lib/rails/configuration.rb b/railties/lib/rails/configuration.rb
index f6159b9347..4a70a4800e 100644
--- a/railties/lib/rails/configuration.rb
+++ b/railties/lib/rails/configuration.rb
@@ -108,10 +108,9 @@ module Rails
defined?(::RAILS_FRAMEWORK_ROOT) ? ::RAILS_FRAMEWORK_ROOT : "#{root_path}/vendor/rails"
end
- # TODO: Fix this when there is an application object
def middleware
- require 'action_controller'
- ActionController::Dispatcher.middleware
+ require 'action_dispatch'
+ @middleware ||= ActionDispatch::MiddlewareStack.new
end
# Loads and returns the contents of the #database_configuration_file. The