summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarin Jankovski <marin@gitlab.com>2020-01-30 14:56:34 +0100
committerMarin Jankovski <marin@gitlab.com>2020-01-30 14:56:34 +0100
commitb0dac638975888582da878cdae1946ac5ef4487d (patch)
tree3559a747030455c71dfdab8371e97489cfde53b0
parent278e60e30f48112da546352c81a7ae13a04d2719 (diff)
parent30bff68f12dabe372a430ae9125211664ccbfe7d (diff)
downloadgitlab-ce-b0dac638975888582da878cdae1946ac5ef4487d.tar.gz
Merge branch '12-6-stable' of gitlab.com:gitlab-org/security/gitlab-foss into 12-6-stable
-rw-r--r--GITLAB_WORKHORSE_VERSION2
-rw-r--r--changelogs/unreleased/a-signing-workhorse.yml5
2 files changed, 6 insertions, 1 deletions
diff --git a/GITLAB_WORKHORSE_VERSION b/GITLAB_WORKHORSE_VERSION
index 38b5f0deaee..ba624dacf9a 100644
--- a/GITLAB_WORKHORSE_VERSION
+++ b/GITLAB_WORKHORSE_VERSION
@@ -1 +1 @@
-8.18.0
+8.20.0
diff --git a/changelogs/unreleased/a-signing-workhorse.yml b/changelogs/unreleased/a-signing-workhorse.yml
new file mode 100644
index 00000000000..35b2963a83b
--- /dev/null
+++ b/changelogs/unreleased/a-signing-workhorse.yml
@@ -0,0 +1,5 @@
+---
+title: Update workhorse to v8.20.0
+merge_request:
+author:
+type: security