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_dispatch/routing | |
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_dispatch/routing')
-rw-r--r-- | actionpack/lib/action_dispatch/routing/deprecated_mapper.rb | 1 | ||||
-rw-r--r-- | actionpack/lib/action_dispatch/routing/route_set.rb | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/actionpack/lib/action_dispatch/routing/deprecated_mapper.rb b/actionpack/lib/action_dispatch/routing/deprecated_mapper.rb index c97cbfe1f1..e04062ce8b 100644 --- a/actionpack/lib/action_dispatch/routing/deprecated_mapper.rb +++ b/actionpack/lib/action_dispatch/routing/deprecated_mapper.rb @@ -1,7 +1,6 @@ require 'active_support/core_ext/object/blank' require 'active_support/core_ext/object/with_options' require 'active_support/core_ext/object/try' -require 'action_controller/metal/exceptions' module ActionDispatch module Routing diff --git a/actionpack/lib/action_dispatch/routing/route_set.rb b/actionpack/lib/action_dispatch/routing/route_set.rb index e6803b2722..b531cc1a8e 100644 --- a/actionpack/lib/action_dispatch/routing/route_set.rb +++ b/actionpack/lib/action_dispatch/routing/route_set.rb @@ -2,7 +2,6 @@ require 'rack/mount' require 'forwardable' require 'active_support/core_ext/object/to_query' require 'action_dispatch/routing/deprecated_mapper' -require 'action_controller/metal/exceptions' module ActionDispatch module Routing |