diff options
author | Yehuda Katz <wycats@gmail.com> | 2009-08-08 12:54:02 -0300 |
---|---|---|
committer | Yehuda Katz <wycats@gmail.com> | 2009-08-08 12:54:02 -0300 |
commit | ad98827a78d0ee13c5d3b8c5caf2fccfa294277c (patch) | |
tree | c66a41b020dbecd209d4f8de2850eefaa06ba793 /actionpack/lib/action_controller.rb | |
parent | efcfce50c417975ee038a107755a1542a690d39b (diff) | |
parent | 016ed9b4298d187182d05340baddbe98f4eb8fb5 (diff) | |
download | rails-ad98827a78d0ee13c5d3b8c5caf2fccfa294277c.tar.gz rails-ad98827a78d0ee13c5d3b8c5caf2fccfa294277c.tar.bz2 rails-ad98827a78d0ee13c5d3b8c5caf2fccfa294277c.zip |
Merge commit 'jose/responder'
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 8343a87936..37ff618edd 100644 --- a/actionpack/lib/action_controller.rb +++ b/actionpack/lib/action_controller.rb @@ -7,10 +7,10 @@ module ActionController autoload :RackConvenience, "action_controller/metal/rack_convenience" autoload :Rails2Compatibility, "action_controller/metal/compatibility" autoload :Redirector, "action_controller/metal/redirector" - autoload :Renderer, "action_controller/metal/renderer" autoload :RenderingController, "action_controller/metal/rendering_controller" autoload :RenderOptions, "action_controller/metal/render_options" autoload :Rescue, "action_controller/metal/rescuable" + autoload :Responder, "action_controller/metal/responder" autoload :Testing, "action_controller/metal/testing" autoload :UrlFor, "action_controller/metal/url_for" autoload :Session, "action_controller/metal/session" |