From 118c99ff9a5ecd8f14c50d07df5bbadbe5e44c6b Mon Sep 17 00:00:00 2001
From: Nick Thomas <nick@gitlab.com>
Date: Mon, 21 Sep 2020 15:44:50 +0100
Subject: [PATCH] Update CHANGELOG for 8.47.0

[ci skip]
---
 CHANGELOG                                     | 25 +++++++++++++++++++
 .../gdk-bootstrapping-takes-more-time.yml     |  5 ----
 changelogs/unreleased/generic-packages.yml    |  5 ----
 .../id-increase-lsif-scanner-buffer.yml       |  5 ----
 .../unreleased/jv-log-lsif-zip-cache.yml      |  5 ----
 .../jv-simplify-upload-local-remote.yml       |  5 ----
 .../unreleased/mk-strict-filetype-check.yml   |  5 ----
 .../sh-fix-correlation-id-for-preauth.yml     |  5 ----
 8 files changed, 25 insertions(+), 35 deletions(-)
 delete mode 100644 changelogs/unreleased/gdk-bootstrapping-takes-more-time.yml
 delete mode 100644 changelogs/unreleased/generic-packages.yml
 delete mode 100644 changelogs/unreleased/id-increase-lsif-scanner-buffer.yml
 delete mode 100644 changelogs/unreleased/jv-log-lsif-zip-cache.yml
 delete mode 100644 changelogs/unreleased/jv-simplify-upload-local-remote.yml
 delete mode 100644 changelogs/unreleased/mk-strict-filetype-check.yml
 delete mode 100644 changelogs/unreleased/sh-fix-correlation-id-for-preauth.yml

diff --git a/CHANGELOG b/CHANGELOG
index ac74de3c79d14..7c4f53feca26c 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,30 @@
 # Changelog for gitlab-workhorse
 
+## v8.47.0
+
+### Added
+- Add logging for local LSIF ZIP caching
+  https://gitlab.com/gitlab-org/gitlab-workhorse/-/merge_requests/579
+- Add project level route for Generic Packages uploads
+  https://gitlab.com/gitlab-org/gitlab-workhorse/-/merge_requests/596
+
+### Changed
+- Further simplify remote/local upload code
+  https://gitlab.com/gitlab-org/gitlab-workhorse/-/merge_requests/602
+- Experimental: Use strict content checks when resizing images
+  https://gitlab.com/gitlab-org/gitlab-workhorse/-/merge_requests/564
+
+### Fixed
+- Increase LSIF scanner buffer
+  https://gitlab.com/gitlab-org/gitlab-workhorse/-/merge_requests/609
+- Fix correlation IDs not being propagated in preauth check
+  https://gitlab.com/gitlab-org/gitlab-workhorse/-/merge_requests/607
+
+### Other
+- Reflect the actual duration of bootstrapping GitLab
+  https://gitlab.com/gitlab-org/gitlab-workhorse/-/merge_requests/605
+  Contributed by Takuya Noguchi
+
 ## v8.46.0
 
 ### Added
diff --git a/changelogs/unreleased/gdk-bootstrapping-takes-more-time.yml b/changelogs/unreleased/gdk-bootstrapping-takes-more-time.yml
deleted file mode 100644
index 95894bc0c8618..0000000000000
--- a/changelogs/unreleased/gdk-bootstrapping-takes-more-time.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Reflect the actual duration of bootstrapping GitLab
-merge_request: 605
-author: Takuya Noguchi
-type: other
diff --git a/changelogs/unreleased/generic-packages.yml b/changelogs/unreleased/generic-packages.yml
deleted file mode 100644
index 812ba7b633a50..0000000000000
--- a/changelogs/unreleased/generic-packages.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Add project level route for Generic Packages uploads
-merge_request: 596
-author:
-type: added
diff --git a/changelogs/unreleased/id-increase-lsif-scanner-buffer.yml b/changelogs/unreleased/id-increase-lsif-scanner-buffer.yml
deleted file mode 100644
index 5d6ecf1418663..0000000000000
--- a/changelogs/unreleased/id-increase-lsif-scanner-buffer.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Increase LSIF scanner buffer
-merge_request: 609
-author:
-type: fixed
diff --git a/changelogs/unreleased/jv-log-lsif-zip-cache.yml b/changelogs/unreleased/jv-log-lsif-zip-cache.yml
deleted file mode 100644
index bedf3c1a4c25d..0000000000000
--- a/changelogs/unreleased/jv-log-lsif-zip-cache.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Add logging for local LSIF ZIP caching
-merge_request: 579
-author:
-type: added
diff --git a/changelogs/unreleased/jv-simplify-upload-local-remote.yml b/changelogs/unreleased/jv-simplify-upload-local-remote.yml
deleted file mode 100644
index 59eaa25841522..0000000000000
--- a/changelogs/unreleased/jv-simplify-upload-local-remote.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Further simplify remote/local upload code
-merge_request: 602
-author:
-type: changed
diff --git a/changelogs/unreleased/mk-strict-filetype-check.yml b/changelogs/unreleased/mk-strict-filetype-check.yml
deleted file mode 100644
index f01890c2a0c70..0000000000000
--- a/changelogs/unreleased/mk-strict-filetype-check.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: 'Experimental: Use strict content checks when resizing images'
-merge_request: 564
-author:
-type: changed
diff --git a/changelogs/unreleased/sh-fix-correlation-id-for-preauth.yml b/changelogs/unreleased/sh-fix-correlation-id-for-preauth.yml
deleted file mode 100644
index 41947ab00eaa0..0000000000000
--- a/changelogs/unreleased/sh-fix-correlation-id-for-preauth.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fix correlation IDs not being propagated in preauth check
-merge_request: 607
-author:
-type: fixed
-- 
GitLab