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 /activesupport/lib | |
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 'activesupport/lib')
-rw-r--r-- | activesupport/lib/active_support/cache.rb | 1 | ||||
-rw-r--r-- | activesupport/lib/active_support/secure_random.rb | 2 |
2 files changed, 0 insertions, 3 deletions
diff --git a/activesupport/lib/active_support/cache.rb b/activesupport/lib/active_support/cache.rb index 6fade577c4..df35540b55 100644 --- a/activesupport/lib/active_support/cache.rb +++ b/activesupport/lib/active_support/cache.rb @@ -9,7 +9,6 @@ require 'active_support/core_ext/numeric/bytes' require 'active_support/core_ext/numeric/time' require 'active_support/core_ext/object/to_param' require 'active_support/core_ext/string/inflections' -require 'action_controller/metal/exceptions' module ActiveSupport # See ActiveSupport::Cache::Store for documentation. diff --git a/activesupport/lib/active_support/secure_random.rb b/activesupport/lib/active_support/secure_random.rb index e2fbd0fd81..488a7e14a7 100644 --- a/activesupport/lib/active_support/secure_random.rb +++ b/activesupport/lib/active_support/secure_random.rb @@ -1,5 +1,3 @@ -require 'action_controller/metal/exceptions' - begin require 'securerandom' rescue LoadError |