aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails
diff options
context:
space:
mode:
authorJon Leighton <j@jonathanleighton.com>2011-05-23 19:45:49 +0100
committerJon Leighton <j@jonathanleighton.com>2011-05-23 20:25:44 +0100
commit1170cceaaec8c0c8aef173913405be1456e4b2be (patch)
tree226e6eb1294b6490a9842d604330a948951e2135 /railties/lib/rails
parentd411c85a65baaf4ed268b1b1bb4df408cee4981a (diff)
downloadrails-1170cceaaec8c0c8aef173913405be1456e4b2be.tar.gz
rails-1170cceaaec8c0c8aef173913405be1456e4b2be.tar.bz2
rails-1170cceaaec8c0c8aef173913405be1456e4b2be.zip
Removed ActiveSupport::SecureRandom in favour of SecureRandom from the standard library. (It has been deprecated in the 3-1-stable branch.)
Diffstat (limited to 'railties/lib/rails')
-rw-r--r--railties/lib/rails/generators/app_base.rb2
-rw-r--r--railties/lib/rails/tasks/misc.rake2
2 files changed, 2 insertions, 2 deletions
diff --git a/railties/lib/rails/generators/app_base.rb b/railties/lib/rails/generators/app_base.rb
index 8512b1ca4a..caa9c1016c 100644
--- a/railties/lib/rails/generators/app_base.rb
+++ b/railties/lib/rails/generators/app_base.rb
@@ -1,5 +1,5 @@
require 'digest/md5'
-require 'active_support/secure_random'
+require 'securerandom'
require 'active_support/core_ext/string/strip'
require 'rails/version' unless defined?(Rails::VERSION)
require 'rbconfig'
diff --git a/railties/lib/rails/tasks/misc.rake b/railties/lib/rails/tasks/misc.rake
index 53e479b924..833fcb6f72 100644
--- a/railties/lib/rails/tasks/misc.rake
+++ b/railties/lib/rails/tasks/misc.rake
@@ -9,7 +9,7 @@ end
desc 'Generate a cryptographically secure secret key (this is typically used to generate a secret for cookie sessions).'
task :secret do
- require 'active_support/secure_random'
+ require 'securerandom'
puts SecureRandom.hex(64)
end