diff options
| author | José Valim <jose.valim@gmail.com> | 2010-09-02 21:10:29 +0200 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2010-09-02 21:11:03 +0200 |
| commit | 599e46bf24419a429ee0bb0ea02afd48f47aa4ec (patch) | |
| tree | 725252bd044bd41ec1952be7a65265576302dc2a /actionpack/lib/action_controller/metal | |
| parent | 13d2a081645db873379668b6f21e449201b6b036 (diff) | |
| download | rails-599e46bf24419a429ee0bb0ea02afd48f47aa4ec.tar.gz rails-599e46bf24419a429ee0bb0ea02afd48f47aa4ec.tar.bz2 rails-599e46bf24419a429ee0bb0ea02afd48f47aa4ec.zip | |
Revert "Setup explicit requires for files with exceptions. Removed them from autoloading."
Booting a new Rails application does not work after this commit [#5359 state:open]
This reverts commit 38a421b34d0b414564e919f67d339fac067a56e6.
Diffstat (limited to 'actionpack/lib/action_controller/metal')
4 files changed, 0 insertions, 6 deletions
diff --git a/actionpack/lib/action_controller/metal/compatibility.rb b/actionpack/lib/action_controller/metal/compatibility.rb index dc711e31a9..7a9c91f563 100644 --- a/actionpack/lib/action_controller/metal/compatibility.rb +++ b/actionpack/lib/action_controller/metal/compatibility.rb @@ -1,5 +1,3 @@ -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 ab5238bea4..b5f1d23ef0 100644 --- a/actionpack/lib/action_controller/metal/redirecting.rb +++ b/actionpack/lib/action_controller/metal/redirecting.rb @@ -1,5 +1,3 @@ -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 04d53e2ba1..fc3118671f 100644 --- a/actionpack/lib/action_controller/metal/request_forgery_protection.rb +++ b/actionpack/lib/action_controller/metal/request_forgery_protection.rb @@ -1,5 +1,4 @@ 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 debb2e1c35..d75b46dace 100644 --- a/actionpack/lib/action_controller/metal/streaming.rb +++ b/actionpack/lib/action_controller/metal/streaming.rb @@ -1,5 +1,4 @@ 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, |