diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-05-26 15:03:28 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-05-26 15:03:28 +0000 |
commit | 4be7581ecd2d7acd92210048e379f57b2b30b171 (patch) | |
tree | 47813e612a0065c8085d23dee8c57d554bf6b50e | |
parent | f1b3d2c93c16f8dcac2955368a4a93e5c85fafe4 (diff) | |
download | gitlab-ce-4be7581ecd2d7acd92210048e379f57b2b30b171.tar.gz |
Add latest changes from gitlab-org/security/gitlab@12-9-stable-ee
-rw-r--r-- | GITLAB_WORKHORSE_VERSION | 2 | ||||
-rw-r--r-- | changelogs/unreleased/security-gb-fix-workhorse-zip-metadata-resources.yml | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/GITLAB_WORKHORSE_VERSION b/GITLAB_WORKHORSE_VERSION index 2465b5f7b85..ae1f60d7f6e 100644 --- a/GITLAB_WORKHORSE_VERSION +++ b/GITLAB_WORKHORSE_VERSION @@ -1 +1 @@ -8.25.2 +8.25.3 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 |