diff options
| author | Douwe Maan <douwe@gitlab.com> | 2016-03-01 19:01:18 +0300 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-03-01 19:04:32 +0300 |
| commit | c05bb007370256bf45315eb2ee55c86e329f2654 (patch) | |
| tree | a59c3fbb0012e1cbda206820f7a8a74b769712c6 /app/models/user.rb | |
| parent | e11ab453ee4feb1926464b0060a46e4294e61c35 (diff) | |
Merge branch 'rs-improve-grace-period' into 'master'
Don't show any "2FA required" message if it's not actually required
Prior, if the user had enabled and then disabled 2FA, they would be
shown a "You must enable Two-factor Authentication for your account."
message when going back to re-activate it, even if 2FA enforcement was
disabled.
See merge request !3014
Diffstat (limited to 'app/models/user.rb')
| -rw-r--r-- | app/models/user.rb | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/app/models/user.rb b/app/models/user.rb index 02ff2456f2b..2ef8d851b26 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -354,11 +354,12 @@ class User < ActiveRecord::Base def disable_two_factor! update_attributes( - two_factor_enabled: false, - encrypted_otp_secret: nil, - encrypted_otp_secret_iv: nil, - encrypted_otp_secret_salt: nil, - otp_backup_codes: nil + two_factor_enabled: false, + encrypted_otp_secret: nil, + encrypted_otp_secret_iv: nil, + encrypted_otp_secret_salt: nil, + otp_grace_period_started_at: nil, + otp_backup_codes: nil ) end |