Update CHANGELOG.md for 12.4.2

[ci skip]

13 files changed, 21 insertions, 61 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 64f7957860c..fda536ae157 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,27 @@
 documentation](doc/development/changelog.md) for instructions on adding your own
 entry.
 
+## 12.4.2
+
+### Fixed (10 changes)
+
+- Increase timeout for FetchInternalRemote RPC call. !18908
+- Clean up duplicate indexes on ci_trigger_requests. !19053
+- Fix project imports not working with serialized data. !19124
+- Fixed welcome screen icons not showing. !19148
+- Disable protected path throttling by default. !19185
+- Fix Prometheus duplicate metrics. !19327
+- Fix ref switcher not working on Microsoft Edge. !19335
+- Extend gRPC timeouts for Rake tasks. !19461
+- Disable upload HTTP caching to fix case when object storage is enabled and proxy_download is disabled. !19494
+- Removes arrow icons for old collapsible sections.
+
+### Changed (2 changes)
+
+- Increased deactivation threshold to 180 days. !18902
+- Add extra sentence about registry to AutoDevOps popup. !19092
+
+
 ## 12.4.1
 
 ### Security (14 changes)
diff --git a/changelogs/unreleased/34684-job-log.yml b/changelogs/unreleased/34684-job-log.yml
deleted file mode 100644
index 5d7172fefd0..00000000000
--- a/changelogs/unreleased/34684-job-log.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Removes arrow icons for old collapsible sections
-merge_request:
-author:
-type: fixed
diff --git a/changelogs/unreleased/34887-fix-prom-duplicate-metrics.yml b/changelogs/unreleased/34887-fix-prom-duplicate-metrics.yml
deleted file mode 100644
index 4d9a29f7556..00000000000
--- a/changelogs/unreleased/34887-fix-prom-duplicate-metrics.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fix Prometheus duplicate metrics
-merge_request: 19327
-author:
-type: fixed
diff --git a/changelogs/unreleased/35337-images-stopped-loading-signed-urls-of-uploads-expire-earlier-than-r.yml b/changelogs/unreleased/35337-images-stopped-loading-signed-urls-of-uploads-expire-earlier-than-r.yml
deleted file mode 100644
index 649a341f538..00000000000
--- a/changelogs/unreleased/35337-images-stopped-loading-signed-urls-of-uploads-expire-earlier-than-r.yml
+++ /dev/null
@@ -1,6 +0,0 @@
----
-title: Disable upload HTTP caching to fix case when object storage is enabled and
-  proxy_download is disabled
-merge_request: 19494
-author:
-type: fixed
diff --git a/changelogs/unreleased/dz-ask-users-to-enable-registry.yml b/changelogs/unreleased/dz-ask-users-to-enable-registry.yml
deleted file mode 100644
index 52ea1045fdf..00000000000
--- a/changelogs/unreleased/dz-ask-users-to-enable-registry.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Add extra sentence about registry to AutoDevOps popup
-merge_request: 19092
-author:
-type: changed
diff --git a/changelogs/unreleased/ph-34768-fixIconsNotLoading.yml b/changelogs/unreleased/ph-34768-fixIconsNotLoading.yml
deleted file mode 100644
index 487ec5d33bd..00000000000
--- a/changelogs/unreleased/ph-34768-fixIconsNotLoading.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fixed welcome screen icons not showing
-merge_request: 19148
-author:
-type: fixed
diff --git a/changelogs/unreleased/sh-change-throttle-protected-paths-default.yml b/changelogs/unreleased/sh-change-throttle-protected-paths-default.yml
deleted file mode 100644
index ef6cb80a280..00000000000
--- a/changelogs/unreleased/sh-change-throttle-protected-paths-default.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Disable protected path throttling by default
-merge_request: 19185
-author:
-type: fixed
diff --git a/changelogs/unreleased/sh-clean-duplicate-ci-trigger-request-indexes.yml b/changelogs/unreleased/sh-clean-duplicate-ci-trigger-request-indexes.yml
deleted file mode 100644
index 1c86e325558..00000000000
--- a/changelogs/unreleased/sh-clean-duplicate-ci-trigger-request-indexes.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Clean up duplicate indexes on ci_trigger_requests
-merge_request: 19053
-author:
-type: fixed
diff --git a/changelogs/unreleased/sh-fix-grpc-timeouts-backup.yml b/changelogs/unreleased/sh-fix-grpc-timeouts-backup.yml
deleted file mode 100644
index 41cd6e93d0f..00000000000
--- a/changelogs/unreleased/sh-fix-grpc-timeouts-backup.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Extend gRPC timeouts for Rake tasks
-merge_request: 19461
-author:
-type: fixed
diff --git a/changelogs/unreleased/sh-fix-project-import-commit-status.yml b/changelogs/unreleased/sh-fix-project-import-commit-status.yml
deleted file mode 100644
index 2c21adde4fa..00000000000
--- a/changelogs/unreleased/sh-fix-project-import-commit-status.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fix project imports not working with serialized data
-merge_request: 19124
-author:
-type: fixed
diff --git a/changelogs/unreleased/sh-workaround-ms-edge-form-bug.yml b/changelogs/unreleased/sh-workaround-ms-edge-form-bug.yml
deleted file mode 100644
index 98fd742243d..00000000000
--- a/changelogs/unreleased/sh-workaround-ms-edge-form-bug.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fix ref switcher not working on Microsoft Edge
-merge_request: 19335
-author:
-type: fixed
diff --git a/changelogs/unreleased/use-long_timeout-for-fetch_internal_remote_gitaly-rpc.yml b/changelogs/unreleased/use-long_timeout-for-fetch_internal_remote_gitaly-rpc.yml
deleted file mode 100644
index eebfaf5bda7..00000000000
--- a/changelogs/unreleased/use-long_timeout-for-fetch_internal_remote_gitaly-rpc.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Increase timeout for FetchInternalRemote RPC call
-merge_request: 18908
-author:
-type: fixed
diff --git a/changelogs/unreleased/user-deactivation-minimum-days-extend.yml b/changelogs/unreleased/user-deactivation-minimum-days-extend.yml
deleted file mode 100644
index ac489e933db..00000000000
--- a/changelogs/unreleased/user-deactivation-minimum-days-extend.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Increased deactivation threshold to 180 days
-merge_request: 18902
-author:
-type: changed