summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Release Tools Bot <robert+release-tools@gitlab.com>2019-11-26 12:01:48 +0000
committerGitLab Release Tools Bot <robert+release-tools@gitlab.com>2019-11-26 12:01:48 +0000
commitf9db08fde1a1b3c54c0115ca853f83c70727e0d8 (patch)
tree8d1b5f6d2292a3d8be5e1674872e2c3acac3ac06
parent774a7ed239a9f3ad2f31246b6d6e32dbac82b3f1 (diff)
parent501e5841226bd88cfd1214dfdde0ecb9a84d34ba (diff)
downloadgitlab-ce-f9db08fde1a1b3c54c0115ca853f83c70727e0d8.tar.gz
Merge branch 'security-29660-update-dependencies-12-4' into '12-4-stable'
Update Workhorse and Gitaly to fix a security issue See merge request gitlab/gitlabhq!3500
-rw-r--r--GITALY_SERVER_VERSION2
-rw-r--r--GITLAB_WORKHORSE_VERSION2
-rw-r--r--changelogs/unreleased/security-29660-update-dependencies-12-4.yml5
3 files changed, 7 insertions, 2 deletions
diff --git a/GITALY_SERVER_VERSION b/GITALY_SERVER_VERSION
index 65ee0959841..737e2ba5099 100644
--- a/GITALY_SERVER_VERSION
+++ b/GITALY_SERVER_VERSION
@@ -1 +1 @@
-1.67.0
+1.67.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-12-4.yml b/changelogs/unreleased/security-29660-update-dependencies-12-4.yml
new file mode 100644
index 00000000000..283d951e69e
--- /dev/null
+++ b/changelogs/unreleased/security-29660-update-dependencies-12-4.yml
@@ -0,0 +1,5 @@
+---
+title: Update Workhorse and Gitaly to fix a security issue
+merge_request:
+author:
+type: security