From e5fb18114f47d99ad8af6122430749f8efffd266 Mon Sep 17 00:00:00 2001
From: Nick Thomas <nick@gitlab.com>
Date: Thu, 1 Oct 2020 13:02:58 +0100
Subject: [PATCH] Update CHANGELOG for 8.49.0

[ci skip]
---
 CHANGELOG                                        | 16 ++++++++++++++++
 ...pniagov-fix-image-resizing-binary-install.yml |  5 -----
 changelogs/unreleased/bump-labkit.yml            |  5 -----
 .../unreleased/image-resizer-correlation-id.yml  |  5 -----
 .../unreleased/jv-simplify-s3-sessions.yml       |  5 -----
 .../mk-more-image-scaler-prometheus-metrics.yml  |  5 -----
 6 files changed, 16 insertions(+), 25 deletions(-)
 delete mode 100644 changelogs/unreleased/alipniagov-fix-image-resizing-binary-install.yml
 delete mode 100644 changelogs/unreleased/bump-labkit.yml
 delete mode 100644 changelogs/unreleased/image-resizer-correlation-id.yml
 delete mode 100644 changelogs/unreleased/jv-simplify-s3-sessions.yml
 delete mode 100644 changelogs/unreleased/mk-more-image-scaler-prometheus-metrics.yml

diff --git a/CHANGELOG b/CHANGELOG
index d17750308fd70..622c6d67871e8 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,21 @@
 # Changelog for gitlab-workhorse
 
+## v8.49.0
+
+### Fixed
+- Fix gitlab-resize-image bin installation
+  https://gitlab.com/gitlab-org/gitlab-workhorse/-/merge_requests/618
+
+### Other
+- Add image scaler duration histogram
+  https://gitlab.com/gitlab-org/gitlab-workhorse/-/merge_requests/614
+- Pass CORRELATION_ID env variable to resize image subprocesses
+  https://gitlab.com/gitlab-org/gitlab-workhorse/-/merge_requests/612
+- Simplify s3 session management code
+  https://gitlab.com/gitlab-org/gitlab-workhorse/-/merge_requests/616
+- Bump labkit dependency to get mutex profiling
+  https://gitlab.com/gitlab-org/gitlab-workhorse/-/merge_requests/
+
 ## v8.48.0
 
 ### Changed
diff --git a/changelogs/unreleased/alipniagov-fix-image-resizing-binary-install.yml b/changelogs/unreleased/alipniagov-fix-image-resizing-binary-install.yml
deleted file mode 100644
index a2ceac3562e19..0000000000000
--- a/changelogs/unreleased/alipniagov-fix-image-resizing-binary-install.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fix gitlab-resize-image bin installation
-merge_request: 618
-author:
-type: fixed
diff --git a/changelogs/unreleased/bump-labkit.yml b/changelogs/unreleased/bump-labkit.yml
deleted file mode 100644
index a23c8da654ae0..0000000000000
--- a/changelogs/unreleased/bump-labkit.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Bump labkit dependency to get mutex profiling
-merge_request:
-author:
-type: other
diff --git a/changelogs/unreleased/image-resizer-correlation-id.yml b/changelogs/unreleased/image-resizer-correlation-id.yml
deleted file mode 100644
index 1bc2c5767ff4a..0000000000000
--- a/changelogs/unreleased/image-resizer-correlation-id.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Pass CORRELATION_ID env variable to resize image subprocesses
-merge_request: 612
-author:
-type: other
diff --git a/changelogs/unreleased/jv-simplify-s3-sessions.yml b/changelogs/unreleased/jv-simplify-s3-sessions.yml
deleted file mode 100644
index 8984cb448fd03..0000000000000
--- a/changelogs/unreleased/jv-simplify-s3-sessions.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Simplify s3 session management code
-merge_request: 616
-author:
-type: other
diff --git a/changelogs/unreleased/mk-more-image-scaler-prometheus-metrics.yml b/changelogs/unreleased/mk-more-image-scaler-prometheus-metrics.yml
deleted file mode 100644
index 229933e6be200..0000000000000
--- a/changelogs/unreleased/mk-more-image-scaler-prometheus-metrics.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Add image scaler duration histogram
-merge_request: 614
-author:
-type: other
-- 
GitLab