diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-06-23 11:48:22 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-06-23 11:48:22 +0300 |
| commit | f189c36d8d352deccbd37b8ae92ca0c539e330c3 (patch) | |
| tree | 7fd67948d200908821302ab9fb3454af65a46655 /CHANGELOG | |
| parent | 4aa1fdd347d1df4001d9e1298e6dc09c0c478c2e (diff) | |
| parent | dcfce8b1988af62806a8bcdfd38bc2dcc0b7cf4e (diff) | |
Merge branch 'rs-dev-issue-2414' into 'master'
Allow Admin to filter users by 2FA status
> 
Closes internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2414
See merge request !852
Diffstat (limited to 'CHANGELOG')
| -rw-r--r-- | CHANGELOG | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG index 53258e7fd1a..a8aaec1e566 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -10,6 +10,8 @@ v 7.13.0 (unreleased) - Update ssl_ciphers in Nginx example to remove DHE settings. This will deny forward secrecy for Android 2.3.7, Java 6 and OpenSSL 0.9.8 - 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) |