summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Release Tools Bot <delivery-team+release-tools@gitlab.com>2020-05-28 22:00:39 +0000
committerGitLab Release Tools Bot <delivery-team+release-tools@gitlab.com>2020-05-28 22:00:39 +0000
commit348f0102cadd8699707aacbcffd398e26cf7a6ef (patch)
treeaf73ba4f99646487b0fb753e0a897718cbeaa16d
parentf6690e638f11431faa3ebb8fa87d67185b62a059 (diff)
downloadgitlab-ce-348f0102cadd8699707aacbcffd398e26cf7a6ef.tar.gz
Update CHANGELOG.md for 12.10.8
[ci skip]
-rw-r--r--CHANGELOG.md8
-rw-r--r--changelogs/unreleased/218557-geo-design-thumbnails-are-not-replicated.yml5
-rw-r--r--changelogs/unreleased/sh-fix-artifacts-download-404.yml5
3 files changed, 8 insertions, 10 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7a01b71d1ef..1926c68a7f1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,14 @@
documentation](doc/development/changelog.md) for instructions on adding your own
entry.
+## 12.10.8 (2020-05-28)
+
+### Fixed (2 changes)
+
+- Fix Geo replication for design thumbnails. !32703
+- Fix 404s downloading build artifacts. !32741
+
+
## 12.10.7 (2020-05-27)
### Security (14 changes)
diff --git a/changelogs/unreleased/218557-geo-design-thumbnails-are-not-replicated.yml b/changelogs/unreleased/218557-geo-design-thumbnails-are-not-replicated.yml
deleted file mode 100644
index 73ebbb06630..00000000000
--- a/changelogs/unreleased/218557-geo-design-thumbnails-are-not-replicated.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fix Geo replication for design thumbnails
-merge_request: 32703
-author:
-type: fixed
diff --git a/changelogs/unreleased/sh-fix-artifacts-download-404.yml b/changelogs/unreleased/sh-fix-artifacts-download-404.yml
deleted file mode 100644
index 37615394344..00000000000
--- a/changelogs/unreleased/sh-fix-artifacts-download-404.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fix 404s downloading build artifacts
-merge_request: 32741
-author:
-type: fixed