summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Release Tools Bot <robert+release-tools@gitlab.com>2019-11-26 17:02:51 +0000
committerGitLab Release Tools Bot <robert+release-tools@gitlab.com>2019-11-26 17:02:51 +0000
commitdfac6800795f87717bf96adf9641e8cec0c241ad (patch)
tree5fad40236e284f207aa63234b6b293b8731f26de
parent6b50c98f7a3c38627603da3650240a401789bb79 (diff)
parent8c244b81e799e78041d08c489e083d98c65af019 (diff)
downloadgitlab-ce-dfac6800795f87717bf96adf9641e8cec0c241ad.tar.gz
Merge branch 'security-29660-update-dependencies' into 'master'
Update Workhorse and Gitaly to fix a security issue See merge request gitlab/gitlabhq!3499
-rw-r--r--GITALY_SERVER_VERSION2
-rw-r--r--GITLAB_WORKHORSE_VERSION2
-rw-r--r--changelogs/unreleased/security-29660-update-dependencies.yml5
3 files changed, 7 insertions, 2 deletions
diff --git a/GITALY_SERVER_VERSION b/GITALY_SERVER_VERSION
index dc87e8af82f..22d6771a47d 100644
--- a/GITALY_SERVER_VERSION
+++ b/GITALY_SERVER_VERSION
@@ -1 +1 @@
-1.74.0
+1.72.1
diff --git a/GITLAB_WORKHORSE_VERSION b/GITLAB_WORKHORSE_VERSION
index 2a5dd0d6389..6092827e644 100644
--- a/GITLAB_WORKHORSE_VERSION
+++ b/GITLAB_WORKHORSE_VERSION
@@ -1 +1 @@
-8.14.0
+8.14.1
diff --git a/changelogs/unreleased/security-29660-update-dependencies.yml b/changelogs/unreleased/security-29660-update-dependencies.yml
new file mode 100644
index 00000000000..283d951e69e
--- /dev/null
+++ b/changelogs/unreleased/security-29660-update-dependencies.yml
@@ -0,0 +1,5 @@
+---
+title: Update Workhorse and Gitaly to fix a security issue
+merge_request:
+author:
+type: security