diff options
| author | Ryan Bigg <radarlistener@gmail.com> | 2008-12-21 13:30:51 +1030 |
|---|---|---|
| committer | Ryan Bigg <radarlistener@gmail.com> | 2008-12-21 13:30:51 +1030 |
| commit | 4fc9f69e54e649e2bc14a796ad7363426958a5ad (patch) | |
| tree | f6bb401cb70e449fc79b1754fd46fa4fa71ad5da /actionpack/lib/action_controller.rb | |
| parent | 199f4c54ea3139168a867b7f80ac789a3c29a48d (diff) | |
| parent | 19939fd4c0d0e4eae4ec71df13228547dba03287 (diff) | |
| download | rails-4fc9f69e54e649e2bc14a796ad7363426958a5ad.tar.gz rails-4fc9f69e54e649e2bc14a796ad7363426958a5ad.tar.bz2 rails-4fc9f69e54e649e2bc14a796ad7363426958a5ad.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' |