diff options
| author | Robert Speicher <robert@gitlab.com> | 2015-06-24 19:24:20 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2015-06-24 19:24:20 +0000 |
| commit | d2de219f6cf5d6ce371f529988f9337653878e58 (patch) | |
| tree | b37da0f9b071353cfaaf097804951f262a95be2d /CHANGELOG | |
| parent | c465af093096990ee42b3021fce157d02b8864cb (diff) | |
| parent | 6548e9b48c079bb29cfe61eff99179e880583641 (diff) | |
| download | gitlab-ce-d2de219f6cf5d6ce371f529988f9337653878e58.tar.gz | |
Merge branch 'add-2fa-status-to-admin-api' into 'master'
Add 2FA status to user admin API
This MR adds the `two_factor_enabled` field to the admin's API to indicate whether a given user has enabled 2FA.
See merge request !881
Diffstat (limited to 'CHANGELOG')
| -rw-r--r-- | CHANGELOG | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG index 60ee11b5f6e..0c20479c8b1 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -2,6 +2,7 @@ Please view this file on the master branch, on stable branches it's out of date. v 7.13.0 (unreleased) - Fix Merge Request webhook to properly fire "merge" action when accepted from the web UI + - Add `two_factor_enabled` field to admin user API (Stan Hu) - Fix invalid timestamps in RSS feeds (Rowan Wookey) - Fix error when deleting a user who has projects (Stan Hu) - Fix downloading of patches on public merge requests when user logged out (Stan Hu) |