Add latest changes from gitlab-org/gitlab@12-8-stable-ee

9 files changed, 20 insertions, 27 deletions

diff --git a/CHANGELOG-EE.md b/CHANGELOG-EE.md
index 94863cfeecb..fe723f5d1ef 100644
--- a/CHANGELOG-EE.md
+++ b/CHANGELOG-EE.md
@@ -1,5 +1,12 @@
 Please view this file on the master branch, on stable branches it's out of date.
 
+## 12.8.1
+
+### Performance (1 change)
+
+- Geo - Fix query to retrieve Job Artifacts when selective sync is disabled. !25388
+
+
 ## 12.8.0
 
 ### Removed (1 change)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8affe528f28..f50be96ac50 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,17 @@
 documentation](doc/development/changelog.md) for instructions on adding your own
 entry.
 
+## 12.8.1
+
+### Fixed (5 changes)
+
+- Fix markdown layout of incident issues. !25352
+- Time series extends axis options correctly. !25399
+- Fix "Edit Release" page. !25469
+- Fix upgrade failure in EE displaying license. !25788
+- Fixed last commit widget when Gravatar is disabled.
+
+
 ## 12.8.0
 
 ### Security (6 changes, 2 of them are from the community)
diff --git a/GITALY_SERVER_VERSION b/GITALY_SERVER_VERSION
index 0aee7e7e945..e56b2006c57 100644
--- a/GITALY_SERVER_VERSION
+++ b/GITALY_SERVER_VERSION
@@ -1 +1 @@
-12.8.0
+12.8.1
diff --git a/VERSION b/VERSION
index 6f9a86b0a5d..76fb2fd8733 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-12.8.0-ee
+12.8.1-ee
diff --git a/changelogs/unreleased/metrics-anomaly-chart-rendering-fails.yml b/changelogs/unreleased/metrics-anomaly-chart-rendering-fails.yml
deleted file mode 100644
index 367ad99c77b..00000000000
--- a/changelogs/unreleased/metrics-anomaly-chart-rendering-fails.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Time series extends axis options correctly
-merge_request: 25399
-author:
-type: fixed
diff --git a/changelogs/unreleased/nfriend-fix-edit-release-page.yml b/changelogs/unreleased/nfriend-fix-edit-release-page.yml
deleted file mode 100644
index 5155499d4e0..00000000000
--- a/changelogs/unreleased/nfriend-fix-edit-release-page.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fix "Edit Release" page
-merge_request: 25469
-author:
-type: fixed
diff --git a/changelogs/unreleased/ph-207723-userTypeGravatarDisabled.yml b/changelogs/unreleased/ph-207723-userTypeGravatarDisabled.yml
deleted file mode 100644
index 047d3aee506..00000000000
--- a/changelogs/unreleased/ph-207723-userTypeGravatarDisabled.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fixed last commit widget when Gravatar is disabled
-merge_request:
-author:
-type: fixed
diff --git a/changelogs/unreleased/pl-incident-issue-hline.yml b/changelogs/unreleased/pl-incident-issue-hline.yml
deleted file mode 100644
index 6b161aadb50..00000000000
--- a/changelogs/unreleased/pl-incident-issue-hline.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fix markdown layout of incident issues
-merge_request: 25352
-author:
-type: fixed
diff --git a/changelogs/unreleased/sh-fix-license-check-migration.yml b/changelogs/unreleased/sh-fix-license-check-migration.yml
deleted file mode 100644
index 95e15c2f303..00000000000
--- a/changelogs/unreleased/sh-fix-license-check-migration.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fix upgrade failure in EE displaying license
-merge_request: 25788
-author:
-type: fixed