diff options
| author | Drew Blessing <drew@gitlab.com> | 2015-12-14 15:34:46 -0600 |
|---|---|---|
| committer | Drew Blessing <drew@gitlab.com> | 2015-12-14 15:35:02 -0600 |
| commit | be41d84fb078667694ecbf5f2729175fbf8b0343 (patch) | |
| tree | 3b5618dee5bd02d265e14f3e53450f0404458cbd /config/initializers | |
| parent | b95f7b1864672b873501792775521a6bd6393520 (diff) | |
| download | gitlab-ce-be41d84fb078667694ecbf5f2729175fbf8b0343.tar.gz | |
Allow account unlock via email
Diffstat (limited to 'config/initializers')
| -rw-r--r-- | config/initializers/devise.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb index 5fb43a86e13..2a09a4d3739 100644 --- a/config/initializers/devise.rb +++ b/config/initializers/devise.rb @@ -121,14 +121,14 @@ Devise.setup do |config| config.lock_strategy = :failed_attempts # Defines which key will be used when locking and unlocking an account - # config.unlock_keys = [ :email ] + config.unlock_keys = [ :email ] # Defines which strategy will be used to unlock an account. # :email = Sends an unlock link to the user email # :time = Re-enables login after a certain amount of time (see :unlock_in below) # :both = Enables both strategies # :none = No unlock strategy. You should handle unlocking by yourself. - config.unlock_strategy = :time + config.unlock_strategy = :both # Number of authentication tries before locking an account if lock_strategy # is failed attempts. |