diff options
| author | Carl Lerche <carllerche@mac.com> | 2009-09-01 12:19:09 -0700 |
|---|---|---|
| committer | Carl Lerche <carllerche@mac.com> | 2009-09-01 12:19:09 -0700 |
| commit | 016b1d3596ce12367edac8bb442f5c630a453ecf (patch) | |
| tree | 49435918ebb372f617c3cc95bc495f6dd5c12d24 /actionpack/lib/action_controller.rb | |
| parent | 22d5e3d89d619acb9179dfcdd33f1afaee9567ca (diff) | |
| parent | da636809daca9c338200811d3590e446f57c8e81 (diff) | |
| download | rails-016b1d3596ce12367edac8bb442f5c630a453ecf.tar.gz rails-016b1d3596ce12367edac8bb442f5c630a453ecf.tar.bz2 rails-016b1d3596ce12367edac8bb442f5c630a453ecf.zip | |
Merge branch 'master' of git@github.com:rails/rails
Diffstat (limited to 'actionpack/lib/action_controller.rb')
| -rw-r--r-- | actionpack/lib/action_controller.rb | 5 |
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" |