diff options
author | Timothy Andrew <mail@timothyandrew.net> | 2017-06-21 09:05:54 +0000 |
---|---|---|
committer | Timothy Andrew <mail@timothyandrew.net> | 2017-06-21 09:05:54 +0000 |
commit | d0ff075d290745c7658d0dfb5ca2fd6dda7d1dc1 (patch) | |
tree | 83eb8463913cc61d402b9dcd64c885e0833f7742 | |
parent | 18ef5be6c4f41d671398bf754dec84ba9a897609 (diff) | |
download | gitlab-ce-d0ff075d290745c7658d0dfb5ca2fd6dda7d1dc1.tar.gz |
Update CHANGELOG.md for 9.2.7
[ci skip]
-rw-r--r-- | CHANGELOG.md | 4 | ||||
-rw-r--r-- | changelogs/unreleased/33260-allow-admins-to-list-admins.yml | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index f43858a00a5..af5f5809c41 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,10 @@ documentation](doc/development/changelog.md) for instructions on adding your own entry. +## 9.2.7 (2017-06-21) + +- Reinstate is_admin flag in users api when authenticated user is an admin. !12211 (rickettm) + ## 9.2.6 (2017-06-16) - Fix the last coverage in trace log should be extracted. !11128 (dosuken123) diff --git a/changelogs/unreleased/33260-allow-admins-to-list-admins.yml b/changelogs/unreleased/33260-allow-admins-to-list-admins.yml deleted file mode 100644 index a3b2053e005..00000000000 --- a/changelogs/unreleased/33260-allow-admins-to-list-admins.yml +++ /dev/null @@ -1,4 +0,0 @@ ---- -title: Reinstate is_admin flag in users api when authenticated user is an admin -merge_request: 12211 -author: rickettm |