1
0
Fork 0
mirror of https://github.com/heartcombo/devise.git synced 2022-11-09 12:18:31 -05:00

Move config.pepper from encryptable into database_authenticatable section in the initializer.

config.pepper is used by both database_authenticatable and encryptable,
but encryptable requires database_authenticatable anyway, so it makes
more sense to have it in the database_authenticatable section.
This commit is contained in:
Jo Liss 2011-01-12 01:45:18 +08:00 committed by José Valim
parent aa61034d40
commit 258eb1c7e6

View file

@ -53,6 +53,9 @@ Devise.setup do |config|
# using other encryptors, it sets how many times you want the password re-encrypted. # using other encryptors, it sets how many times you want the password re-encrypted.
config.stretches = 10 config.stretches = 10
# Setup a pepper to generate the encrypted password.
# config.pepper = <%= ActiveSupport::SecureRandom.hex(64).inspect %>
# ==> Configuration for :confirmable # ==> Configuration for :confirmable
# The time you want to give your user to confirm his account. During this time # The time you want to give your user to confirm his account. During this time
# he will be able to access your application without confirming. Default is 0.days # he will be able to access your application without confirming. Default is 0.days
@ -124,9 +127,6 @@ Devise.setup do |config|
# REST_AUTH_SITE_KEY to pepper) # REST_AUTH_SITE_KEY to pepper)
# config.encryptor = :sha512 # config.encryptor = :sha512
# Setup a pepper to generate the encrypted password.
# config.pepper = <%= ActiveSupport::SecureRandom.hex(64).inspect %>
# ==> Configuration for :token_authenticatable # ==> Configuration for :token_authenticatable
# Defines name of the authentication token params key # Defines name of the authentication token params key
# config.token_authentication_key = :auth_token # config.token_authentication_key = :auth_token