diff --git a/CHANGELOG.md b/CHANGELOG.md index f43858a00a5104f47f34a2617beb20aaa1f87405..af5f5809c416758fa7fdde7ec638ff2940c50f58 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 a3b2053e005ffe56b85b3c4543c97fb4344a9101..0000000000000000000000000000000000000000 --- 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