aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport
diff options
context:
space:
mode:
authorŁukasz Strzałkowski <lukasz.strzalkowski@gmail.com>2010-08-11 21:56:22 +0200
committerJosé Valim <jose.valim@gmail.com>2010-09-02 11:54:04 +0200
commit38a421b34d0b414564e919f67d339fac067a56e6 (patch)
tree049be1f37edf18d380b9e8716e2a3165b67be71e /activesupport
parentc5c839f75f332b02f85fc74f5d1b1347cba411ff (diff)
downloadrails-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 'activesupport')
-rw-r--r--activesupport/lib/active_support/cache.rb1
-rw-r--r--activesupport/lib/active_support/secure_random.rb2
2 files changed, 3 insertions, 0 deletions
diff --git a/activesupport/lib/active_support/cache.rb b/activesupport/lib/active_support/cache.rb
index df35540b55..6fade577c4 100644
--- a/activesupport/lib/active_support/cache.rb
+++ b/activesupport/lib/active_support/cache.rb
@@ -9,6 +9,7 @@ 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 488a7e14a7..e2fbd0fd81 100644
--- a/activesupport/lib/active_support/secure_random.rb
+++ b/activesupport/lib/active_support/secure_random.rb
@@ -1,3 +1,5 @@
+require 'action_controller/metal/exceptions'
+
begin
require 'securerandom'
rescue LoadError