summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClement Ho <ClemMakesApps@gmail.com>2017-05-23 15:44:43 -0500
committerClement Ho <ClemMakesApps@gmail.com>2017-05-23 15:44:43 -0500
commitff7d559ad21755e208aebfe1ed68692702d3a333 (patch)
treeb270271af24695f836b056e6df7958ad69ec8f9d
parent677229bb4cce279149e983afdfb86ec18c27e710 (diff)
downloadgitlab-ce-ff7d559ad21755e208aebfe1ed68692702d3a333.tar.gz
Update CHANGELOG.md for 9.2.1
[ci skip]
-rw-r--r--CHANGELOG.md5
-rw-r--r--changelogs/unreleased/32486-fix-note-emoji-placement.yml4
-rw-r--r--changelogs/unreleased/fix-migration-for-postgres.yml4
3 files changed, 5 insertions, 8 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 20e701c6b22..e4f48ccb450 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,11 @@
documentation](doc/development/changelog.md) for instructions on adding your own
entry.
+## 9.2.1 (2017-05-23)
+
+- Fix placement of note emoji on hover.
+- Fix migration for older PostgreSQL versions.
+
## 9.2.0 (2017-05-22)
- API: Filter merge requests by milestone and labels. (10924)
diff --git a/changelogs/unreleased/32486-fix-note-emoji-placement.yml b/changelogs/unreleased/32486-fix-note-emoji-placement.yml
deleted file mode 100644
index 62c345895fc..00000000000
--- a/changelogs/unreleased/32486-fix-note-emoji-placement.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Fix placement of note emoji on hover
-merge_request:
-author:
diff --git a/changelogs/unreleased/fix-migration-for-postgres.yml b/changelogs/unreleased/fix-migration-for-postgres.yml
deleted file mode 100644
index dda7051c8f5..00000000000
--- a/changelogs/unreleased/fix-migration-for-postgres.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Fix migration for older PostgreSQL versions
-merge_request:
-author: