aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller.rb
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2011-05-02 19:21:03 -0500
committerDavid Heinemeier Hansson <david@loudthinking.com>2011-05-02 19:21:03 -0500
commitb359f9fe7cc3f664e145fae7b0d5b5c309587ef8 (patch)
tree386bac9ca264c2355741ba967334030f518b73fa /actionpack/lib/action_controller.rb
parentb29a905f949dbed5052c55184bd5e0838517ec8d (diff)
parent35d0d82ae3edf8fe959624999c858a63b2b4ed52 (diff)
downloadrails-b359f9fe7cc3f664e145fae7b0d5b5c309587ef8.tar.gz
rails-b359f9fe7cc3f664e145fae7b0d5b5c309587ef8.tar.bz2
rails-b359f9fe7cc3f664e145fae7b0d5b5c309587ef8.zip
Merge branch 'master' of github.com:rails/rails
Diffstat (limited to 'actionpack/lib/action_controller.rb')
-rw-r--r--actionpack/lib/action_controller.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/actionpack/lib/action_controller.rb b/actionpack/lib/action_controller.rb
index aab2b9dc25..eba5e9377b 100644
--- a/actionpack/lib/action_controller.rb
+++ b/actionpack/lib/action_controller.rb
@@ -23,6 +23,7 @@ module ActionController
autoload :ImplicitRender
autoload :Instrumentation
autoload :MimeResponds
+ autoload :ParamsWrapper
autoload :RackDelegation
autoload :Redirecting
autoload :Renderers