diff options
author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-06-23 14:24:16 +0000 |
---|---|---|
committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-06-23 14:24:16 +0000 |
commit | 94f130cbfc0349c1b17d4882e7d5c367030b21d1 (patch) | |
tree | a6c0258c256bece75fc5a5fcecc4fa2f74daed2a /CHANGELOG | |
parent | b51fe6831123830f729295e16bd5aa99e3012c57 (diff) | |
parent | 4acd1f5d6a1942d4348b5d94e278fdb25c29e532 (diff) | |
download | gitlab-ce-94f130cbfc0349c1b17d4882e7d5c367030b21d1.tar.gz |
Merge branch 'admin-edit-identities' into 'master'
Admin can see, edit and remove user identities
Related to #1415 and https://dev.gitlab.org/gitlab/gitlabhq/issues/2224
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
See merge request !843
Diffstat (limited to 'CHANGELOG')
-rw-r--r-- | CHANGELOG | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG index 43a4f0f2798..6ba09e952bf 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -10,6 +10,7 @@ v 7.13.0 (unreleased) - Rename "Design" profile settings page to "Preferences". - Allow users to customize their default Dashboard page. - 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 + - 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. |