diff options
| author | Timothy Andrew <mail@timothyandrew.net> | 2017-06-21 09:05:53 +0000 |
|---|---|---|
| committer | Timothy Andrew <mail@timothyandrew.net> | 2017-06-21 09:05:53 +0000 |
| commit | a8c5d7b9aad89246544e56dfb5348d23896e6f68 (patch) | |
| tree | e9a7b7e952f6cfeca3e3d98287800a33e16e4e1b | |
| parent | c8ab22d0e4bc16209aa10a09cd52db778bf0b2df (diff) | |
| download | gitlab-ce-a8c5d7b9aad89246544e56dfb5348d23896e6f68.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 d6328d670fc..064b2c5ef4d 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 |