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 /CHANGELOG | |
| 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 'CHANGELOG')
| -rw-r--r-- | CHANGELOG | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG index 24fa4e8a808..ec5a5a01636 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -6,6 +6,7 @@ v 8.5.2 - Bring the "branded appearance" feature from EE to CE - Fix error 500 when commenting on a commit - Improve implementation to check read access to forks and add pagination + - Don't show any "2FA required" message if it's not actually required - Update Rails to 4.2.5.2 v 8.5.1 |