diff options
| author | Emilio Tagua <miloops@gmail.com> | 2009-05-04 19:23:34 -0300 |
|---|---|---|
| committer | Emilio Tagua <miloops@gmail.com> | 2009-05-04 19:23:34 -0300 |
| commit | d3042ef80c4406c90ff1e120059a99784d8ae79f (patch) | |
| tree | a779b4fced3fd546d7c7c855fee41f3d996afba0 /actionpack/lib/action_controller.rb | |
| parent | d522b7ccf61a71b4c66ddf39368513d1fd9cd577 (diff) | |
| parent | eb201e64c0b68aee6d0715d44cf48178204c4133 (diff) | |
| download | rails-d3042ef80c4406c90ff1e120059a99784d8ae79f.tar.gz rails-d3042ef80c4406c90ff1e120059a99784d8ae79f.tar.bz2 rails-d3042ef80c4406c90ff1e120059a99784d8ae79f.zip | |
Merge commit 'rails/master'
Diffstat (limited to 'actionpack/lib/action_controller.rb')
| -rw-r--r-- | actionpack/lib/action_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller.rb b/actionpack/lib/action_controller.rb index aee6b9dc9f..ab78bc9222 100644 --- a/actionpack/lib/action_controller.rb +++ b/actionpack/lib/action_controller.rb @@ -60,7 +60,7 @@ module ActionController autoload :Redirector, 'action_controller/base/redirect' autoload :Renderer, 'action_controller/base/render' autoload :RequestForgeryProtection, 'action_controller/base/request_forgery_protection' - autoload :Rescue, 'action_controller/dispatch/rescue' + autoload :Rescue, 'action_controller/base/rescue' autoload :Resources, 'action_controller/routing/resources' autoload :Responder, 'action_controller/base/responder' autoload :Routing, 'action_controller/routing' |