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

13 files changed, 24 insertions, 51 deletions

diff --git a/CHANGELOG-EE.md b/CHANGELOG-EE.md
index b52bdaef27d..12caedf0c32 100644
--- a/CHANGELOG-EE.md
+++ b/CHANGELOG-EE.md
@@ -1,5 +1,9 @@
 Please view this file on the master branch, on stable branches it's out of date.
 
+## 12.6.3
+
+- No changes.
+
 ## 12.6.2
 
 ### Security (2 changes)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8fb44fa826d..8b02034466d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,25 @@
 documentation](doc/development/changelog.md) for instructions on adding your own
 entry.
 
+## 12.6.3
+
+### Security (1 change)
+
+- Upgrade json-jwt to v1.11.0. !22440
+
+### Fixed (9 changes)
+
+- Fix RefreshMergeRequestsService raises an exception and unnecessary sidekiq retry. !22262
+- Disable Prometheus metrics if initialization fails. !22355
+- Fix bug when trying to expose artifacts and no artifacts are produced by the job. !22378
+- Gracefully error handle CI lint errors in artifacts section. !22388
+- Fix GitLab plugins not working without hooks configured. !22409
+- Fix releases page when tag contains a slash. !22527
+- Reverts Add RBAC permissions for getting knative version. !22560
+- Remove unused keyword from EKS provision service. !22633
+- Fix CAS users being signed out repeatedly. !22704
+
+
 ## 12.6.2
 
 ### Security (6 changes)
diff --git a/VERSION b/VERSION
index 4768309b67f..c7190eac8d3 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-12.6.2-ee
+12.6.3-ee
diff --git a/changelogs/unreleased/121670-redis-cache-read-error-prevents-cas-users-from-remaining-signed-in.yml b/changelogs/unreleased/121670-redis-cache-read-error-prevents-cas-users-from-remaining-signed-in.yml
deleted file mode 100644
index 3a54a6dce20..00000000000
--- a/changelogs/unreleased/121670-redis-cache-read-error-prevents-cas-users-from-remaining-signed-in.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fix CAS users being signed out repeatedly
-merge_request: 22704
-author:
-type: fixed
diff --git a/changelogs/unreleased/121751-new-eks-cluster-results-in-error-unknown-keyword-region.yml b/changelogs/unreleased/121751-new-eks-cluster-results-in-error-unknown-keyword-region.yml
deleted file mode 100644
index 09cd2f00fb5..00000000000
--- a/changelogs/unreleased/121751-new-eks-cluster-results-in-error-unknown-keyword-region.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Remove unused keyword from EKS provision service
-merge_request: 22633
-author:
-type: fixed
diff --git a/changelogs/unreleased/39119-actioncontroller-urlgenerationerror-no-route-matches-action-evidenc.yml b/changelogs/unreleased/39119-actioncontroller-urlgenerationerror-no-route-matches-action-evidenc.yml
deleted file mode 100644
index 25d8ef6651b..00000000000
--- a/changelogs/unreleased/39119-actioncontroller-urlgenerationerror-no-route-matches-action-evidenc.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fix releases page when tag contains a slash
-merge_request: 22527
-author:
-type: fixed
diff --git a/changelogs/unreleased/fix-no-artifacts-when-exposed.yml b/changelogs/unreleased/fix-no-artifacts-when-exposed.yml
deleted file mode 100644
index 7ca77f520a6..00000000000
--- a/changelogs/unreleased/fix-no-artifacts-when-exposed.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fix bug when trying to expose artifacts and no artifacts are produced by the job
-merge_request: 22378
-author:
-type: fixed
diff --git a/changelogs/unreleased/fix-on-train-method-in-mr.yml b/changelogs/unreleased/fix-on-train-method-in-mr.yml
deleted file mode 100644
index 5599964638d..00000000000
--- a/changelogs/unreleased/fix-on-train-method-in-mr.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fix RefreshMergeRequestsService raises an exception and unnecessary sidekiq retry
-merge_request: 22262
-author:
-type: fixed
diff --git a/changelogs/unreleased/revert-knative-version-prerequisite.yml b/changelogs/unreleased/revert-knative-version-prerequisite.yml
deleted file mode 100644
index bc0bb1e25f3..00000000000
--- a/changelogs/unreleased/revert-knative-version-prerequisite.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Reverts Add RBAC permissions for getting knative version
-merge_request: 22560
-author:
-type: fixed
diff --git a/changelogs/unreleased/sh-bump-json-jwt.yml b/changelogs/unreleased/sh-bump-json-jwt.yml
deleted file mode 100644
index afa8c8bbf20..00000000000
--- a/changelogs/unreleased/sh-bump-json-jwt.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Upgrade json-jwt to v1.11.0
-merge_request: 22440
-author:
-type: security
diff --git a/changelogs/unreleased/sh-disable-prom-metrics-on-failure.yml b/changelogs/unreleased/sh-disable-prom-metrics-on-failure.yml
deleted file mode 100644
index d9db2847d2e..00000000000
--- a/changelogs/unreleased/sh-disable-prom-metrics-on-failure.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Disable Prometheus metrics if initialization fails
-merge_request: 22355
-author:
-type: fixed
diff --git a/changelogs/unreleased/sh-fix-ci-lint-errors.yml b/changelogs/unreleased/sh-fix-ci-lint-errors.yml
deleted file mode 100644
index 5f97b98f3d9..00000000000
--- a/changelogs/unreleased/sh-fix-ci-lint-errors.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Gracefully error handle CI lint errors in artifacts section
-merge_request: 22388
-author:
-type: fixed
diff --git a/changelogs/unreleased/sh-fix-plugins-not-executing.yml b/changelogs/unreleased/sh-fix-plugins-not-executing.yml
deleted file mode 100644
index 206d8bedc41..00000000000
--- a/changelogs/unreleased/sh-fix-plugins-not-executing.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fix GitLab plugins not working without hooks configured
-merge_request: 22409
-author:
-type: fixed