aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller.rb
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2008-12-03 10:32:30 -0600
committerJeremy Kemper <jeremy@bitsweat.net>2008-12-03 10:32:30 -0600
commit99f2cb4918786382413bdd29b3cacfd5b9377677 (patch)
tree9279a5f1b63a03f51b1a04734a4c70bb6b6c3546 /actionpack/lib/action_controller.rb
parent0b4858cf38f522208381f9bfbbb5c066aceb30d2 (diff)
parent1e1056f6435254c81f02fd0fba53d9356050cb00 (diff)
downloadrails-99f2cb4918786382413bdd29b3cacfd5b9377677.tar.gz
rails-99f2cb4918786382413bdd29b3cacfd5b9377677.tar.bz2
rails-99f2cb4918786382413bdd29b3cacfd5b9377677.zip
Merge branch 'master' of git@github.com:rails/rails
Diffstat (limited to 'actionpack/lib/action_controller.rb')
-rw-r--r--actionpack/lib/action_controller.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/actionpack/lib/action_controller.rb b/actionpack/lib/action_controller.rb
index da5f1e81e6..2981f625a1 100644
--- a/actionpack/lib/action_controller.rb
+++ b/actionpack/lib/action_controller.rb
@@ -57,6 +57,7 @@ module ActionController
autoload :Integration, 'action_controller/integration'
autoload :IntegrationTest, 'action_controller/integration'
autoload :Layout, 'action_controller/layout'
+ autoload :MiddlewareStack, 'action_controller/middleware_stack'
autoload :MimeResponds, 'action_controller/mime_responds'
autoload :PolymorphicRoutes, 'action_controller/polymorphic_routes'
autoload :RackRequest, 'action_controller/rack_process'