diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-05-26 15:03:45 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-05-26 15:03:45 +0000 |
commit | 4f5df57e8688ae0c591271af9b30c63541b7378c (patch) | |
tree | 7abbf0b7df100c1c4c86f2360474129e52353371 | |
parent | 10fc441cba99167120253ed05c53bcb16e80771c (diff) | |
download | gitlab-ce-4f5df57e8688ae0c591271af9b30c63541b7378c.tar.gz |
Add latest changes from gitlab-org/security/gitlab@12-10-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 57b9fc187c0..a965193b27f 100644 --- a/GITLAB_WORKHORSE_VERSION +++ b/GITLAB_WORKHORSE_VERSION @@ -1 +1 @@ -8.30.1 +8.30.2 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 |