home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-26 04:56:16 +10:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'password-reset-timeout' into 'master'

Browse Source 
Password reset timeout

/cc @jacobvosmaer

See merge request !1428
This commit is contained in:
Dmitriy Zaporozhets
2015-01-23 20:36:13 +00:00
parent 1d9e427439 31bf578d67
commit 1708b6cdc4
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CHANGELOG
+1 -1
View File
@@ -37,7 +37,7 @@ v 7.8.0
-
-
-
-
- Password reset token validity increased from 2 hours to 2 days since it is also send on account creation.
-
-
-
config/initializers/devise.rb
+2 -1
View File
@@ -145,7 +145,8 @@ Devise.setup do |config|
# Time interval you can reset your password with a reset password key.
# Don't put a too small interval or your users won't have the time to
# change their passwords.
config.reset_password_within = 2.hours
# When someone else invites you to GitLab this time is also used so it should be pretty long.
config.reset_password_within = 2.days
# ==> Configuration for :encryptable
# Allow you to use another encryption algorithm besides bcrypt (default). You can use