diff options
| author | Łukasz Strzałkowski <lukasz.strzalkowski@gmail.com> | 2010-08-11 21:56:22 +0200 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2010-09-02 11:54:04 +0200 |
| commit | 38a421b34d0b414564e919f67d339fac067a56e6 (patch) | |
| tree | 049be1f37edf18d380b9e8716e2a3165b67be71e /actionpack/lib/action_controller/metal | |
| parent | c5c839f75f332b02f85fc74f5d1b1347cba411ff (diff) | |
| download | rails-38a421b34d0b414564e919f67d339fac067a56e6.tar.gz rails-38a421b34d0b414564e919f67d339fac067a56e6.tar.bz2 rails-38a421b34d0b414564e919f67d339fac067a56e6.zip | |
Setup explicit requires for files with exceptions. Removed them from autoloading.
Signed-off-by: José Valim <jose.valim@gmail.com>
Diffstat (limited to 'actionpack/lib/action_controller/metal')
4 files changed, 6 insertions, 0 deletions
diff --git a/actionpack/lib/action_controller/metal/compatibility.rb b/actionpack/lib/action_controller/metal/compatibility.rb index 7a9c91f563..dc711e31a9 100644 --- a/actionpack/lib/action_controller/metal/compatibility.rb +++ b/actionpack/lib/action_controller/metal/compatibility.rb @@ -1,3 +1,5 @@ +require 'action_controller/metal/exceptions' + module ActionController module Compatibility extend ActiveSupport::Concern diff --git a/actionpack/lib/action_controller/metal/redirecting.rb b/actionpack/lib/action_controller/metal/redirecting.rb index b5f1d23ef0..ab5238bea4 100644 --- a/actionpack/lib/action_controller/metal/redirecting.rb +++ b/actionpack/lib/action_controller/metal/redirecting.rb @@ -1,3 +1,5 @@ +require 'action_controller/metal/exceptions' + module ActionController class RedirectBackError < AbstractController::Error #:nodoc: DEFAULT_MESSAGE = 'No HTTP_REFERER was set in the request to this action, so redirect_to :back could not be called successfully. If this is a test, make sure to specify request.env["HTTP_REFERER"].' diff --git a/actionpack/lib/action_controller/metal/request_forgery_protection.rb b/actionpack/lib/action_controller/metal/request_forgery_protection.rb index fc3118671f..04d53e2ba1 100644 --- a/actionpack/lib/action_controller/metal/request_forgery_protection.rb +++ b/actionpack/lib/action_controller/metal/request_forgery_protection.rb @@ -1,4 +1,5 @@ require 'active_support/core_ext/class/attribute' +require 'action_controller/metal/exceptions' module ActionController #:nodoc: class InvalidAuthenticityToken < ActionControllerError #:nodoc: diff --git a/actionpack/lib/action_controller/metal/streaming.rb b/actionpack/lib/action_controller/metal/streaming.rb index d75b46dace..debb2e1c35 100644 --- a/actionpack/lib/action_controller/metal/streaming.rb +++ b/actionpack/lib/action_controller/metal/streaming.rb @@ -1,4 +1,5 @@ require 'active_support/core_ext/file/path' +require 'action_controller/metal/exceptions' module ActionController #:nodoc: # Methods for sending arbitrary data and for streaming files to the browser, |