aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller.rb
diff options
context:
space:
mode:
authorJoshua Peek <josh@joshpeek.com>2009-01-17 10:16:31 -0600
committerJoshua Peek <josh@joshpeek.com>2009-01-17 10:16:31 -0600
commit515a1a332808eb7c2f9c006fc1903e1e8555b7fa (patch)
tree265b1e7477275c2a7958c65162e776054e806c84 /actionpack/lib/action_controller.rb
parent3ee4e009185173aab78f6503ee45e3ef4482874e (diff)
downloadrails-515a1a332808eb7c2f9c006fc1903e1e8555b7fa.tar.gz
rails-515a1a332808eb7c2f9c006fc1903e1e8555b7fa.tar.bz2
rails-515a1a332808eb7c2f9c006fc1903e1e8555b7fa.zip
Lock middleware has been committed upstream
Diffstat (limited to 'actionpack/lib/action_controller.rb')
-rw-r--r--actionpack/lib/action_controller.rb1
1 files changed, 0 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller.rb b/actionpack/lib/action_controller.rb
index f808bdd910..7a71c64695 100644
--- a/actionpack/lib/action_controller.rb
+++ b/actionpack/lib/action_controller.rb
@@ -56,7 +56,6 @@ module ActionController
autoload :Integration, 'action_controller/integration'
autoload :IntegrationTest, 'action_controller/integration'
autoload :Layout, 'action_controller/layout'
- autoload :Lock, 'action_controller/lock'
autoload :MiddlewareStack, 'action_controller/middleware_stack'
autoload :MimeResponds, 'action_controller/mime_responds'
autoload :PolymorphicRoutes, 'action_controller/polymorphic_routes'