summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-05-26 15:03:02 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-05-26 15:03:02 +0000
commit57b9b49b27a730294ae37d2ac25cab943f4b801d (patch)
treeac93e527f4bcbc922dd4a1df105c9f7fc577ca70
parent13f0d48172df4463fd4c2dbded7fdbbbfe88e0a9 (diff)
downloadgitlab-ce-57b9b49b27a730294ae37d2ac25cab943f4b801d.tar.gz
Add latest changes from gitlab-org/security/gitlab@13-0-stable-ee
-rw-r--r--GITLAB_WORKHORSE_VERSION2
-rw-r--r--changelogs/unreleased/security-gb-fix-workhorse-zip-metadata-resources.yml5
2 files changed, 6 insertions, 1 deletions
diff --git a/GITLAB_WORKHORSE_VERSION b/GITLAB_WORKHORSE_VERSION
index 2f70731b8aa..ffca1dc2418 100644
--- a/GITLAB_WORKHORSE_VERSION
+++ b/GITLAB_WORKHORSE_VERSION
@@ -1 +1 @@
-8.31.0
+8.31.1
diff --git a/changelogs/unreleased/security-gb-fix-workhorse-zip-metadata-resources.yml b/changelogs/unreleased/security-gb-fix-workhorse-zip-metadata-resources.yml
new file mode 100644
index 00000000000..1649bda4df3
--- /dev/null
+++ b/changelogs/unreleased/security-gb-fix-workhorse-zip-metadata-resources.yml
@@ -0,0 +1,5 @@
+---
+title: Limit memory footprint of a command that generates ZIP artifacts metadata
+merge_request:
+author:
+type: security