summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarin Jankovski <marin@gitlab.com>2020-01-30 14:57:44 +0100
committerMarin Jankovski <marin@gitlab.com>2020-01-30 14:57:44 +0100
commitcba4103346307f09203785f5c11f7192e47fe210 (patch)
tree8c7da908394c531278ba36ba5d7bf6f406cb9a03
parentd6787f43a77088f1c7c1b025eb1278913b0c8ada (diff)
parent66d197a15254b91b7af1d456a4edb20c14161d33 (diff)
downloadgitlab-ce-cba4103346307f09203785f5c11f7192e47fe210.tar.gz
Merge branch '12-7-stable' of gitlab.com:gitlab-org/security/gitlab-foss into 12-7-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 401cc8dd3e7..ba624dacf9a 100644
--- a/GITLAB_WORKHORSE_VERSION
+++ b/GITLAB_WORKHORSE_VERSION
@@ -1 +1 @@
-8.19.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