aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails/configuration.rb
diff options
context:
space:
mode:
authorCarl Lerche <carllerche@mac.com>2009-09-01 12:19:09 -0700
committerCarl Lerche <carllerche@mac.com>2009-09-01 12:19:09 -0700
commit016b1d3596ce12367edac8bb442f5c630a453ecf (patch)
tree49435918ebb372f617c3cc95bc495f6dd5c12d24 /railties/lib/rails/configuration.rb
parent22d5e3d89d619acb9179dfcdd33f1afaee9567ca (diff)
parentda636809daca9c338200811d3590e446f57c8e81 (diff)
downloadrails-016b1d3596ce12367edac8bb442f5c630a453ecf.tar.gz
rails-016b1d3596ce12367edac8bb442f5c630a453ecf.tar.bz2
rails-016b1d3596ce12367edac8bb442f5c630a453ecf.zip
Merge branch 'master' of git@github.com:rails/rails
Diffstat (limited to 'railties/lib/rails/configuration.rb')
-rw-r--r--railties/lib/rails/configuration.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/railties/lib/rails/configuration.rb b/railties/lib/rails/configuration.rb
index 5cc4f80684..2b362a9c50 100644
--- a/railties/lib/rails/configuration.rb
+++ b/railties/lib/rails/configuration.rb
@@ -109,6 +109,7 @@ module Rails
# TODO: Fix this when there is an application object
def middleware
+ require 'action_controller'
ActionController::Dispatcher.middleware
end