diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-06-23 12:09:45 +0200 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-06-23 12:09:45 +0200 |
| commit | 8c6cbd430639f03461df625ff1cbeca1294f4b25 (patch) | |
| tree | efab5b4324c6166141e42eaaa04de3087e356b8d /CHANGELOG | |
| parent | 7780a886e7c90b2fbe281d3b8452151c20659543 (diff) | |
| parent | 4b31f4b68319a9099a36d6e59f153a1ae0a50f1d (diff) | |
| download | gitlab-ce-8c6cbd430639f03461df625ff1cbeca1294f4b25.tar.gz | |
Merge branch 'master' into admin-edit-identitiesadmin-edit-identities
Diffstat (limited to 'CHANGELOG')
| -rw-r--r-- | CHANGELOG | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG index 9ba7e1ccf2b..57facfaa7d2 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -11,6 +11,8 @@ v 7.13.0 (unreleased) - Admin can edit and remove user identities - Convert CRLF newlines to LF when committing using the web editor. - API request /projects/:project_id/merge_requests?state=closed will return only closed merge requests without merged one. If you need ones that were merged - use state=merged. + - Allow Administrators to filter the user list by those with or without Two-factor Authentication enabled. + - Show a user's Two-factor Authentication status in the administration area. v 7.12.0 (unreleased) - Fix Error 500 when one user attempts to access a personal, internal snippet (Stan Hu) |