summaryrefslogtreecommitdiff
path: root/config/initializers/devise.rb
diff options
context:
space:
mode:
authorRobert Speicher <rspeicher@gmail.com>2015-09-30 14:35:00 -0400
committerRobert Speicher <rspeicher@gmail.com>2015-09-30 14:35:00 -0400
commit3a4274e19e1a1fbc23fb5fe0d6101ad62099aadb (patch)
tree55436b53e2ff47c8c48907b9328c095c95ebf566 /config/initializers/devise.rb
parent54452412f765d9e6e6166e105db9adbc7553aec2 (diff)
downloadgitlab-ce-3a4274e19e1a1fbc23fb5fe0d6101ad62099aadb.tar.gz
Take advantage of `Devise.sign_in_after_reset_password`rs-disable-signin-after-reset
Diffstat (limited to 'config/initializers/devise.rb')
-rw-r--r--config/initializers/devise.rb4
1 files changed, 4 insertions, 0 deletions
diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb
index 2ce24592f8b..29506970af2 100644
--- a/config/initializers/devise.rb
+++ b/config/initializers/devise.rb
@@ -148,6 +148,10 @@ Devise.setup do |config|
# When someone else invites you to GitLab this time is also used so it should be pretty long.
config.reset_password_within = 2.days
+ # When set to false, does not sign a user in automatically after their password is
+ # reset. Defaults to true, so a user is signed in automatically after a reset.
+ config.sign_in_after_reset_password = false
+
# ==> Configuration for :encryptable
# Allow you to use another encryption algorithm besides bcrypt (default). You can use
# :sha1, :sha512 or encryptors from others authentication tools as :clearance_sha1,