Merge pull request #1087 from eMxyzptlk/patch-2

Rails has removed SecureRandom from ActiveSupport in Rails 3.2, deprecated
heartcombo · May 24, 2011 · acd1c76 · acd1c76
2 parents 2e61e52 + 4c8cc5e
commit acd1c76
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/lib/devise.rb b/lib/devise.rb
@@ -3,6 +3,7 @@
 require 'active_support/dependencies'
 require 'orm_adapter'
 require 'set'
+require 'securerandom'
 
 module Devise
   autoload :FailureApp, 'devise/failure_app'
@@ -402,7 +403,7 @@ def self.configure_warden! #:nodoc:
 
   # Generate a friendly string randomically to be used as token.
   def self.friendly_token
-    ActiveSupport::SecureRandom.base64(15).tr('+/=', 'xyz')
+    SecureRandom.base64(15).tr('+/=', 'xyz')
   end
 
   # constant-time comparison algorithm to prevent timing attacks