Add latest changes from gitlab-org/security/gitlab@13-6-stable-eev13.6.4

9 files changed, 14 insertions, 36 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b676ddad5fa..61d35535fa5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,19 @@
 documentation](doc/development/changelog.md) for instructions on adding your own
 entry.
 
+## 13.6.4 (2021-01-07)
+
+### Security (7 changes)
+
+- Forbid public cache for private repos.
+- Deny implicit flow for confidential apps.
+- Update NuGet regular expression to protect against ReDoS.
+- Fix regular expression backtracking issue in package name validation.
+- Upgrade GitLab Pages to 1.30.2.
+- Update trusted OAuth applications to set them as confidential.
+- Upgrade Workhorse to 8.54.2.
+
+
 ## 13.6.3 (2020-12-10)
 
 ### Fixed (5 changes)
diff --git a/GITALY_SERVER_VERSION b/GITALY_SERVER_VERSION
index 06a348286f5..d59f23d1885 100644
--- a/GITALY_SERVER_VERSION
+++ b/GITALY_SERVER_VERSION
@@ -1 +1 @@
-13.6.3
\ No newline at end of file
+13.6.4
\ No newline at end of file
diff --git a/changelogs/unreleased/security-id-forbid-public-cache-for-private-repos.yml b/changelogs/unreleased/security-id-forbid-public-cache-for-private-repos.yml
deleted file mode 100644
index 20cd1659565..00000000000
--- a/changelogs/unreleased/security-id-forbid-public-cache-for-private-repos.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Forbid public cache for private repos
-merge_request:
-author:
-type: security
diff --git a/changelogs/unreleased/security-implicit-confidential.yml b/changelogs/unreleased/security-implicit-confidential.yml
deleted file mode 100644
index bbf2d95b3fb..00000000000
--- a/changelogs/unreleased/security-implicit-confidential.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Deny implicit flow for confidential apps
-merge_request:
-author:
-type: security
diff --git a/changelogs/unreleased/security-nuget-regex-update-redos.yml b/changelogs/unreleased/security-nuget-regex-update-redos.yml
deleted file mode 100644
index 5182097b8b1..00000000000
--- a/changelogs/unreleased/security-nuget-regex-update-redos.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Update NuGet regular expression to protect against ReDoS
-merge_request:
-author:
-type: security
diff --git a/changelogs/unreleased/security-package-regex-dos.yml b/changelogs/unreleased/security-package-regex-dos.yml
deleted file mode 100644
index 79bec83526d..00000000000
--- a/changelogs/unreleased/security-package-regex-dos.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fix regular expression backtracking issue in package name validation
-merge_request:
-author:
-type: security
diff --git a/changelogs/unreleased/security-pages-1-30-1.yml b/changelogs/unreleased/security-pages-1-30-1.yml
deleted file mode 100644
index 7ea5a838c14..00000000000
--- a/changelogs/unreleased/security-pages-1-30-1.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Upgrade GitLab Pages to 1.30.2
-merge_request:
-author:
-type: security
diff --git a/changelogs/unreleased/security-trusted-confidential-apps.yml b/changelogs/unreleased/security-trusted-confidential-apps.yml
deleted file mode 100644
index b4f7a9eb448..00000000000
--- a/changelogs/unreleased/security-trusted-confidential-apps.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Update trusted OAuth applications to set them as confidential
-merge_request:
-author:
-type: security
diff --git a/changelogs/unreleased/security-workhorse-prometheus-13-6.yml b/changelogs/unreleased/security-workhorse-prometheus-13-6.yml
deleted file mode 100644
index 0f9165ff146..00000000000
--- a/changelogs/unreleased/security-workhorse-prometheus-13-6.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Upgrade Workhorse to 8.54.2
-merge_request:
-author:
-type: security