diff options
| author | Emilio Tagua <miloops@gmail.com> | 2009-08-27 15:56:16 -0300 |
|---|---|---|
| committer | Emilio Tagua <miloops@gmail.com> | 2009-08-27 15:56:16 -0300 |
| commit | d395391e1dfae4531671fbb09911e6b9418474ba (patch) | |
| tree | 65d679e11c15de32c18a4303d6dcb9f88f2a0925 /actionpack/lib/action_controller.rb | |
| parent | 286f47f3b034db4550110b9a0f9ff48dda29e807 (diff) | |
| parent | c10396b1426fcddea35d88fe865846b8aaab5de4 (diff) | |
| download | rails-d395391e1dfae4531671fbb09911e6b9418474ba.tar.gz rails-d395391e1dfae4531671fbb09911e6b9418474ba.tar.bz2 rails-d395391e1dfae4531671fbb09911e6b9418474ba.zip | |
Merge commit 'rails/master'
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 37ff618edd..d27a867efe 100644 --- a/actionpack/lib/action_controller.rb +++ b/actionpack/lib/action_controller.rb @@ -3,6 +3,7 @@ module ActionController autoload :ConditionalGet, "action_controller/metal/conditional_get" autoload :HideActions, "action_controller/metal/hide_actions" autoload :Metal, "action_controller/metal" + autoload :Middleware, "action_controller/middleware" autoload :Layouts, "action_controller/metal/layouts" autoload :RackConvenience, "action_controller/metal/rack_convenience" autoload :Rails2Compatibility, "action_controller/metal/compatibility" |