Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorDrew Blessing <drew@gitlab.com>2015-12-15 00:34:46 +0300
committerDrew Blessing <drew@gitlab.com>2015-12-15 00:35:02 +0300
commitbe41d84fb078667694ecbf5f2729175fbf8b0343 (patch)
tree3b5618dee5bd02d265e14f3e53450f0404458cbd /config
parentb95f7b1864672b873501792775521a6bd6393520 (diff)
Allow account unlock via email
Diffstat (limited to 'config')
-rw-r--r--config/initializers/devise.rb4
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.