summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Release Tools Bot <robert+release-tools@gitlab.com>2019-05-28 13:16:27 +0000
committerGitLab Release Tools Bot <robert+release-tools@gitlab.com>2019-05-28 13:16:27 +0000
commit13213f7d563b82543fcf3a4e2572ef8d74f1b67e (patch)
tree02ee2b11fa4fac70f8da4f49418313c6f443119d
parent32a64720f625471e6fd3232f2a4018ba0a88b6a6 (diff)
parent7961a5dc91b95e80b5b567a9b222cf08ffbca04c (diff)
downloadgitlab-ce-13213f7d563b82543fcf3a4e2572ef8d74f1b67e.tar.gz
Merge branch 'security-pb-fix-get-archive-11-11' into '11-11-stable'
Update Gitaly to fix GetArchive vulnerability See merge request gitlab/gitlabhq!3118
-rw-r--r--GITALY_SERVER_VERSION2
-rw-r--r--changelogs/unreleased/security-pb-fix-get-archive.yml5
2 files changed, 6 insertions, 1 deletions
diff --git a/GITALY_SERVER_VERSION b/GITALY_SERVER_VERSION
index a50908ca3da..2259c77c0b3 100644
--- a/GITALY_SERVER_VERSION
+++ b/GITALY_SERVER_VERSION
@@ -1 +1 @@
-1.42.0
+1.42.2
diff --git a/changelogs/unreleased/security-pb-fix-get-archive.yml b/changelogs/unreleased/security-pb-fix-get-archive.yml
new file mode 100644
index 00000000000..dca4fec7d61
--- /dev/null
+++ b/changelogs/unreleased/security-pb-fix-get-archive.yml
@@ -0,0 +1,5 @@
+---
+title: Update Gitaly to fix GetArchive vulnerability
+merge_request:
+author:
+type: security