From 6d08a5dda2bb602c2f9125ac66765f4f26f9039c Mon Sep 17 00:00:00 2001
From: Mayra Cabrera <mcabrera@gitlab.com>
Date: Mon, 9 Apr 2018 15:53:47 -0500
Subject: [PATCH] Update CHANGELOG.md for 10.6.4

[ci skip]
---
 CHANGELOG.md                                  | 19 +++++++++++++++++++
 ...-domain-verification-validation-errors.yml |  5 -----
 ...-parsing-conflicting-with-auto-linking.yml |  5 -----
 .../unreleased/44717-no-resolve-issue.yml     |  5 -----
 ...s-integration-via-kubernetes-is-broken.yml |  5 -----
 .../unreleased/ac-fix-use_file-race.yml       |  5 -----
 .../dm-refs-contains-sha-encoding.yml         |  5 -----
 ...x-background-pipeline-stages-migration.yml |  5 -----
 changelogs/unreleased/issue_44551.yml         |  5 -----
 ...ge-copy-text-promote-milestones-labels.yml |  5 -----
 .../unreleased/sh-cleanup-pages-worker.yml    |  5 -----
 11 files changed, 19 insertions(+), 50 deletions(-)
 delete mode 100644 changelogs/unreleased/43794-fix-domain-verification-validation-errors.yml
 delete mode 100644 changelogs/unreleased/44649-reference-parsing-conflicting-with-auto-linking.yml
 delete mode 100644 changelogs/unreleased/44717-no-resolve-issue.yml
 delete mode 100644 changelogs/unreleased/45070-prometheus-integration-via-kubernetes-is-broken.yml
 delete mode 100644 changelogs/unreleased/ac-fix-use_file-race.yml
 delete mode 100644 changelogs/unreleased/dm-refs-contains-sha-encoding.yml
 delete mode 100644 changelogs/unreleased/fix-gb-fix-background-pipeline-stages-migration.yml
 delete mode 100644 changelogs/unreleased/issue_44551.yml
 delete mode 100644 changelogs/unreleased/jivl-change-copy-text-promote-milestones-labels.yml
 delete mode 100644 changelogs/unreleased/sh-cleanup-pages-worker.yml

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6b63284a4bf4c..b098440c50ba1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,25 @@
 documentation](doc/development/changelog.md) for instructions on adding your own
 entry.
 
+## 10.6.4 (2018-04-09)
+
+### Fixed (9 changes, 1 of them is from the community)
+
+- Correct copy text for the promote milestone and label modals. !17726
+- Avoid validation errors when running the Pages domain verification service. !17992
+- Fix autolinking URLs containing ampersands. !18045
+- Fix exceptions raised when migrating pipeline stages in the background. !18076
+- Work around Prometheus Helm chart name changes to fix integration. !18206 (joshlambert)
+- Don't show Jump to Discussion button on Issues.
+- Fix data race between ObjectStorage background_upload and Pages publishing.
+- Fix listing commit branch/tags that contain special characters.
+- Fix 404 in group boards when moving issue between lists.
+
+### Performance (1 change)
+
+- Free open file descriptors and libgit2 buffers in UpdatePagesService.
+
+
 ## 10.6.3 (2018-04-03)
 
 ### Security (2 changes)
diff --git a/changelogs/unreleased/43794-fix-domain-verification-validation-errors.yml b/changelogs/unreleased/43794-fix-domain-verification-validation-errors.yml
deleted file mode 100644
index 861820c75387f..0000000000000
--- a/changelogs/unreleased/43794-fix-domain-verification-validation-errors.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Avoid validation errors when running the Pages domain verification service
-merge_request: 17992
-author:
-type: fixed
diff --git a/changelogs/unreleased/44649-reference-parsing-conflicting-with-auto-linking.yml b/changelogs/unreleased/44649-reference-parsing-conflicting-with-auto-linking.yml
deleted file mode 100644
index a64b0efa1edf7..0000000000000
--- a/changelogs/unreleased/44649-reference-parsing-conflicting-with-auto-linking.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fix autolinking URLs containing ampersands
-merge_request: 18045
-author:
-type: fixed
diff --git a/changelogs/unreleased/44717-no-resolve-issue.yml b/changelogs/unreleased/44717-no-resolve-issue.yml
deleted file mode 100644
index ce23f4e6e9fa5..0000000000000
--- a/changelogs/unreleased/44717-no-resolve-issue.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Don't show Jump to Discussion button on Issues
-merge_request:
-author:
-type: fixed
diff --git a/changelogs/unreleased/45070-prometheus-integration-via-kubernetes-is-broken.yml b/changelogs/unreleased/45070-prometheus-integration-via-kubernetes-is-broken.yml
deleted file mode 100644
index 046785deb3fa6..0000000000000
--- a/changelogs/unreleased/45070-prometheus-integration-via-kubernetes-is-broken.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Work around Prometheus Helm chart name changes to fix integration
-merge_request: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/18206/
-author: joshlambert
-type: fixed
diff --git a/changelogs/unreleased/ac-fix-use_file-race.yml b/changelogs/unreleased/ac-fix-use_file-race.yml
deleted file mode 100644
index f1315d5d50e9b..0000000000000
--- a/changelogs/unreleased/ac-fix-use_file-race.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fix data race between ObjectStorage background_upload and Pages publishing
-merge_request:
-author:
-type: fixed
diff --git a/changelogs/unreleased/dm-refs-contains-sha-encoding.yml b/changelogs/unreleased/dm-refs-contains-sha-encoding.yml
deleted file mode 100644
index cdd9ead5a65e8..0000000000000
--- a/changelogs/unreleased/dm-refs-contains-sha-encoding.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fix listing commit branch/tags that contain special characters
-merge_request:
-author:
-type: fixed
diff --git a/changelogs/unreleased/fix-gb-fix-background-pipeline-stages-migration.yml b/changelogs/unreleased/fix-gb-fix-background-pipeline-stages-migration.yml
deleted file mode 100644
index 63948f0c1963b..0000000000000
--- a/changelogs/unreleased/fix-gb-fix-background-pipeline-stages-migration.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fix exceptions raised when migrating pipeline stages in the background
-merge_request: 18076
-author:
-type: fixed
diff --git a/changelogs/unreleased/issue_44551.yml b/changelogs/unreleased/issue_44551.yml
deleted file mode 100644
index d5265667b007c..0000000000000
--- a/changelogs/unreleased/issue_44551.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fix 404 in group boards when moving issue between lists
-merge_request:
-author:
-type: fixed
diff --git a/changelogs/unreleased/jivl-change-copy-text-promote-milestones-labels.yml b/changelogs/unreleased/jivl-change-copy-text-promote-milestones-labels.yml
deleted file mode 100644
index fb3095552d328..0000000000000
--- a/changelogs/unreleased/jivl-change-copy-text-promote-milestones-labels.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Correct copy text for the promote milestone and label modals
-merge_request: 17726
-author:
-type: fixed
diff --git a/changelogs/unreleased/sh-cleanup-pages-worker.yml b/changelogs/unreleased/sh-cleanup-pages-worker.yml
deleted file mode 100644
index c26e1342dd28f..0000000000000
--- a/changelogs/unreleased/sh-cleanup-pages-worker.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Free open file descriptors and libgit2 buffers in UpdatePagesService
-merge_request:
-author:
-type: performance
-- 
GitLab