diff options
author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-07-13 08:49:46 +0000 |
---|---|---|
committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-07-13 08:49:46 +0000 |
commit | 171d6fccae79efe4e85e772cb501b2e23e862b19 (patch) | |
tree | e29d388953560ad60386b96adbac83c47fa3f033 /CHANGELOG | |
parent | d93da8bed598249c67b71b3acdd4944952e80db2 (diff) | |
parent | db8f4c06060d002c63b20ff51871976aaf9c9d4c (diff) | |
download | gitlab-ce-171d6fccae79efe4e85e772cb501b2e23e862b19.tar.gz |
Merge branch 'rs-disable-2fa-by-admin' into 'master'
Allow admins to disable 2FA for a user
> ![Screen_Shot_2015-07-10_at_5.19.13_PM](https://gitlab.com/gitlab-org/gitlab-ce/uploads/3f9bb7c783110d2689c282879cb4b061/Screen_Shot_2015-07-10_at_5.19.13_PM.png)
Depends on !961
See merge request !962
Diffstat (limited to 'CHANGELOG')
-rw-r--r-- | CHANGELOG | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG index baa9a7afb9f..93983c63593 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -45,6 +45,7 @@ v 7.13.0 (unreleased) - Make left menu more hierarchical and less contextual by adding back item at top - A fork can’t have a visibility level that is greater than the original project. - Faster code search in repository and wiki. Fixes search page timeout for big repositories + - Allow administrators to disable 2FA for a specific user v 7.12.2 - Correctly show anonymous authorized applications under Profile > Applications. |