summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTimothy Andrew <mail@timothyandrew.net>2017-06-21 09:05:54 +0000
committerTimothy Andrew <mail@timothyandrew.net>2017-06-21 09:08:50 +0000
commit8f537e5c4164f05f1365579d6472b6583c254cbf (patch)
treec4fd60e344294c4d86cdbd06c959915e308a6353
parent1797984857d3d69329e0d2baf9f778a3f63313eb (diff)
downloadgitlab-ce-8f537e5c4164f05f1365579d6472b6583c254cbf.tar.gz
Update CHANGELOG.md for 9.2.7
[ci skip]
-rw-r--r--CHANGELOG.md4
-rw-r--r--changelogs/unreleased/33260-allow-admins-to-list-admins.yml4
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