diff options
| author | Colin Curtin <colin@procore.com> | 2008-12-20 20:21:20 -0800 |
|---|---|---|
| committer | Colin Curtin <colin@procore.com> | 2008-12-20 20:21:20 -0800 |
| commit | 0e121f9ed93ebb417cc63307aaaf47f8adfd220d (patch) | |
| tree | 39530f289b38a5dd1b2e6b170dab2631c983aaf3 /actionpack/lib/action_controller.rb | |
| parent | b0187434bd7601a5b2e5f7afac99c964e566b9db (diff) | |
| parent | a0d091a41604d709cf2b99c85dcf4ae3ee275b9c (diff) | |
| download | rails-0e121f9ed93ebb417cc63307aaaf47f8adfd220d.tar.gz rails-0e121f9ed93ebb417cc63307aaaf47f8adfd220d.tar.bz2 rails-0e121f9ed93ebb417cc63307aaaf47f8adfd220d.zip | |
Merge branch 'master' of git@github.com:lifo/docrails
Diffstat (limited to 'actionpack/lib/action_controller.rb')
| -rw-r--r-- | actionpack/lib/action_controller.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/actionpack/lib/action_controller.rb b/actionpack/lib/action_controller.rb index c170e4dd2a..eaf7779f1e 100644 --- a/actionpack/lib/action_controller.rb +++ b/actionpack/lib/action_controller.rb @@ -56,6 +56,7 @@ 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' |