aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
diff options
context:
space:
mode:
authorJoshua Peek <josh@joshpeek.com>2009-08-31 14:49:59 -0500
committerJoshua Peek <josh@joshpeek.com>2009-08-31 14:49:59 -0500
commit8974ab2e2e2faf647b03859b618b0302ac6cfcf4 (patch)
tree442eca0c6f48bc03a32009e136718f79b3b2e725 /actionpack
parentc63dac81c1c6476fff81dda7e1b72f239209c7a4 (diff)
downloadrails-8974ab2e2e2faf647b03859b618b0302ac6cfcf4.tar.gz
rails-8974ab2e2e2faf647b03859b618b0302ac6cfcf4.tar.bz2
rails-8974ab2e2e2faf647b03859b618b0302ac6cfcf4.zip
action_dispatch and action_view are just more autoloads, so its okay to require them
Diffstat (limited to 'actionpack')
-rw-r--r--actionpack/lib/action_controller.rb5
1 files changed, 2 insertions, 3 deletions
diff --git a/actionpack/lib/action_controller.rb b/actionpack/lib/action_controller.rb
index d27a867efe..634206e065 100644
--- a/actionpack/lib/action_controller.rb
+++ b/actionpack/lib/action_controller.rb
@@ -59,9 +59,8 @@ end
autoload :HTML, 'action_controller/vendor/html-scanner'
autoload :AbstractController, 'abstract_controller'
-autoload :Rack, 'action_dispatch'
-autoload :ActionDispatch, 'action_dispatch'
-autoload :ActionView, 'action_view'
+require 'action_dispatch'
+require 'action_view'
# Common ActiveSupport usage in ActionController
require "active_support/concern"