Update CHANGELOG.md for 12.8.5

[ci skip]

12 files changed, 23 insertions, 55 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c3b93d1f5cd..a12a34ca1f3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,29 @@
 documentation](doc/development/changelog.md) for instructions on adding your own
 entry.
 
+## 12.8.5
+
+### Fixed (8 changes)
+
+- Fix Group Import API file upload when object storage is disabled. !25715
+- Fix Web IDE fork modal showing no text. !25842
+- Fixed regression when URL was encoded in a loop. !25849
+- Fixed repository browsing for folders with non-ascii characters. !25877
+- Fix search for Sentry error list. !26129
+- Send credentials with GraphQL fetch requests. !26386
+- Show CI status in project dashboards. !26403
+- Rescue invalid URLs during badge retrieval in asset proxy. !26524
+
+### Performance (2 changes)
+
+- Disable Marginalia line backtrace in production. !26199
+- Remove unnecessary Redis deletes for broadcast messages. !26541
+
+### Other (1 change, 1 of them is from the community)
+
+- Fix fixtures for Error Tracking Web UI. !26233 (Takuya Noguchi)
+
+
 ## 12.8.4
 
 - Unreleased due to tagging failure.
diff --git a/changelogs/unreleased/207837-circular-encoding.yml b/changelogs/unreleased/207837-circular-encoding.yml
deleted file mode 100644
index 30aa7bf88a5..00000000000
--- a/changelogs/unreleased/207837-circular-encoding.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fixed regression when URL was encoded in a loop
-merge_request: 25849
-author:
-type: fixed
diff --git a/changelogs/unreleased/207857-fix-web-ide-modal-no-text.yml b/changelogs/unreleased/207857-fix-web-ide-modal-no-text.yml
deleted file mode 100644
index 74bbb312f19..00000000000
--- a/changelogs/unreleased/207857-fix-web-ide-modal-no-text.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fix Web IDE fork modal showing no text
-merge_request: 25842
-author:
-type: fixed
diff --git a/changelogs/unreleased/208548-better-spec-test-for-error-tracking-web-ui.yml b/changelogs/unreleased/208548-better-spec-test-for-error-tracking-web-ui.yml
deleted file mode 100644
index 6b6d479e815..00000000000
--- a/changelogs/unreleased/208548-better-spec-test-for-error-tracking-web-ui.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fix fixtures for Error Tracking Web UI
-merge_request: 26233
-author: Takuya Noguchi
-type: other
diff --git a/changelogs/unreleased/georgekoltsov-fix-import-export-uploader.yml b/changelogs/unreleased/georgekoltsov-fix-import-export-uploader.yml
deleted file mode 100644
index 0c43c93ce89..00000000000
--- a/changelogs/unreleased/georgekoltsov-fix-import-export-uploader.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fix Group Import API file upload when object storage is disabled
-merge_request: 25715
-author:
-type: fixed
diff --git a/changelogs/unreleased/lm-fix-error-query.yml b/changelogs/unreleased/lm-fix-error-query.yml
deleted file mode 100644
index 2baa316dd5a..00000000000
--- a/changelogs/unreleased/lm-fix-error-query.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fix search for Sentry error list
-merge_request: 26129
-author:
-type: fixed
diff --git a/changelogs/unreleased/ph-p207499-fixNonAsciiChars.yml b/changelogs/unreleased/ph-p207499-fixNonAsciiChars.yml
deleted file mode 100644
index 806f4372f89..00000000000
--- a/changelogs/unreleased/ph-p207499-fixNonAsciiChars.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fixed repository browsing for folders with non-ascii characters
-merge_request: 25877
-author:
-type: fixed
diff --git a/changelogs/unreleased/revert-e0613e64.yml b/changelogs/unreleased/revert-e0613e64.yml
deleted file mode 100644
index e94f1df2f4b..00000000000
--- a/changelogs/unreleased/revert-e0613e64.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Show CI status in project dashboards
-merge_request: 26403
-author:
-type: fixed
diff --git a/changelogs/unreleased/sh-disable-line-in-marginalia.yml b/changelogs/unreleased/sh-disable-line-in-marginalia.yml
deleted file mode 100644
index 51be4db1965..00000000000
--- a/changelogs/unreleased/sh-disable-line-in-marginalia.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Disable Marginalia line backtrace in production
-merge_request: 26199
-author:
-type: performance
diff --git a/changelogs/unreleased/sh-optimize-broadcast-message-redis.yml b/changelogs/unreleased/sh-optimize-broadcast-message-redis.yml
deleted file mode 100644
index c69f3ded73d..00000000000
--- a/changelogs/unreleased/sh-optimize-broadcast-message-redis.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Remove unnecessary Redis deletes for broadcast messages
-merge_request: 26541
-author:
-type: performance
diff --git a/changelogs/unreleased/use-addressable-for-asset-proxy-badge-render.yml b/changelogs/unreleased/use-addressable-for-asset-proxy-badge-render.yml
deleted file mode 100644
index 6a021df8027..00000000000
--- a/changelogs/unreleased/use-addressable-for-asset-proxy-badge-render.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Rescue invalid URLs during badge retrieval in asset proxy
-merge_request: 26524
-author:
-type: fixed
diff --git a/changelogs/unreleased/vs-add-credentials-option-for-apollo-link.yml b/changelogs/unreleased/vs-add-credentials-option-for-apollo-link.yml
deleted file mode 100644
index 1863f0de26f..00000000000
--- a/changelogs/unreleased/vs-add-credentials-option-for-apollo-link.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Send credentials with GraphQL fetch requests
-merge_request: 26386
-author:
-type: fixed