Update CHANGELOG.md for 12.0.2

[ci skip]

9 files changed, 17 insertions, 40 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 118034867ad..0d30fc6553f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,23 @@
 documentation](doc/development/changelog.md) for instructions on adding your own
 entry.
 
+## 12.0.2 (2019-06-25)
+
+### Fixed (7 changes, 1 of them is from the community)
+
+- Fix missing API notification flags for Microsoft Teams. !29824 (Seiji Suenaga)
+- Fixed 'diff version changes' link not working. !29825
+- Fix label serialization in issue and note hooks. !29850
+- Include the GitLab version in the cache key for Gitlab::JsonCache. !29938
+- Prevent EE backport migrations from running if CE is not migrated. !30002
+- Silence backup warnings when CRON=1 in use. !30033
+- Fix comment emails not respecting group-level notification email.
+
+### Performance (1 change)
+
+- Omit issues links in merge request entity API response. !29917
+
+
 ## 12.0.1 (2019-06-24)
 
 - No changes.
diff --git a/changelogs/unreleased/59702-fix-notification-flags-for-ms-teams.yml b/changelogs/unreleased/59702-fix-notification-flags-for-ms-teams.yml
deleted file mode 100644
index 14a8da95ed9..00000000000
--- a/changelogs/unreleased/59702-fix-notification-flags-for-ms-teams.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----

-title: Fix missing API notification flags for Microsoft Teams

-merge_request: 29824

-author: Seiji Suenaga

-type: fixed

diff --git a/changelogs/unreleased/63513-ensure-gitlab-jsoncache-includes-the-gitlab-version-in-the-cache-key.yml b/changelogs/unreleased/63513-ensure-gitlab-jsoncache-includes-the-gitlab-version-in-the-cache-key.yml
deleted file mode 100644
index b5715902630..00000000000
--- a/changelogs/unreleased/63513-ensure-gitlab-jsoncache-includes-the-gitlab-version-in-the-cache-key.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Include the GitLab version in the cache key for Gitlab::JsonCache
-merge_request: 29938
-author:
-type: fixed
diff --git a/changelogs/unreleased/bug-63162-duplicate_path_in_links.yml b/changelogs/unreleased/bug-63162-duplicate_path_in_links.yml
deleted file mode 100644
index d3f246492fb..00000000000
--- a/changelogs/unreleased/bug-63162-duplicate_path_in_links.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fixed 'diff version changes' link not working
-merge_request: 29825
-author:
-type: fixed
diff --git a/changelogs/unreleased/fix-labels-in-hooks.yml b/changelogs/unreleased/fix-labels-in-hooks.yml
deleted file mode 100644
index c0904a860c5..00000000000
--- a/changelogs/unreleased/fix-labels-in-hooks.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fix label serialization in issue and note hooks
-merge_request: 29850
-author:
-type: fixed
diff --git a/changelogs/unreleased/fix-notes-emails-with-group-settings.yml b/changelogs/unreleased/fix-notes-emails-with-group-settings.yml
deleted file mode 100644
index 77dae8418a8..00000000000
--- a/changelogs/unreleased/fix-notes-emails-with-group-settings.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fix comment emails not respecting group-level notification email
-merge_request:
-author:
-type: fixed
diff --git a/changelogs/unreleased/sh-omit-issues-links-on-poll.yml b/changelogs/unreleased/sh-omit-issues-links-on-poll.yml
deleted file mode 100644
index 21e51d3534f..00000000000
--- a/changelogs/unreleased/sh-omit-issues-links-on-poll.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Omit issues links in merge request entity API response
-merge_request: 29917
-author:
-type: performance
diff --git a/changelogs/unreleased/sh-quiet-backup-secrets-log.yml b/changelogs/unreleased/sh-quiet-backup-secrets-log.yml
deleted file mode 100644
index cf3e90c0cb1..00000000000
--- a/changelogs/unreleased/sh-quiet-backup-secrets-log.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Silence backup warnings when CRON=1 in use
-merge_request: 30033
-author:
-type: fixed
diff --git a/changelogs/unreleased/sh-recover-ee-schema-backport-migration-failure.yml b/changelogs/unreleased/sh-recover-ee-schema-backport-migration-failure.yml
deleted file mode 100644
index 1695e2827eb..00000000000
--- a/changelogs/unreleased/sh-recover-ee-schema-backport-migration-failure.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Prevent EE backport migrations from running if CE is not migrated
-merge_request: 30002
-author:
-type: fixed