diff options
Diffstat (limited to 'actionpack/lib/action_controller.rb')
| -rwxr-xr-x | actionpack/lib/action_controller.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/action_controller.rb b/actionpack/lib/action_controller.rb index af33d5fcff..8bfa6bd907 100755 --- a/actionpack/lib/action_controller.rb +++ b/actionpack/lib/action_controller.rb @@ -32,9 +32,9 @@ require 'action_controller/benchmarking' require 'action_controller/filters' require 'action_controller/layout' require 'action_controller/flash' +require 'action_controller/dependencies' require 'action_controller/scaffolding' require 'action_controller/helpers' -require 'action_controller/dependencies' require 'action_controller/cookies' require 'action_controller/cgi_process' @@ -44,9 +44,9 @@ ActionController::Base.class_eval do include ActionController::Flash include ActionController::Benchmarking include ActionController::Rescue + include ActionController::Dependencies include ActionController::Scaffolding include ActionController::Helpers - include ActionController::Dependencies include ActionController::Cookies end |