summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2018-03-05 12:57:42 +0000
committerRémy Coutable <remy@rymai.me>2018-03-05 12:57:42 +0000
commit1e75198efd3d5c11d03e8a013ab350b32f141205 (patch)
treeb5435d43c7daac91de6206afb17358280e3604f6
parentbd57be280d6dede47844a23a487a24bbbc49201c (diff)
parent960f981db7e5f3a1bd9ee2ad8682435e1bc71a46 (diff)
downloadgitlab-ce-1e75198efd3d5c11d03e8a013ab350b32f141205.tar.gz
Merge branch 'an/workhorse-3.8.0' into 'master'
Upgrade GitLab Workhorse to 3.8.0 for structured logging support See merge request gitlab-org/gitlab-ce!17479
-rw-r--r--GITLAB_WORKHORSE_VERSION2
-rw-r--r--changelogs/unreleased/an-workhorse-3-8-0.yml5
2 files changed, 6 insertions, 1 deletions
diff --git a/GITLAB_WORKHORSE_VERSION b/GITLAB_WORKHORSE_VERSION
index 40c341bdcdb..19811903a7f 100644
--- a/GITLAB_WORKHORSE_VERSION
+++ b/GITLAB_WORKHORSE_VERSION
@@ -1 +1 @@
-3.6.0
+3.8.0
diff --git a/changelogs/unreleased/an-workhorse-3-8-0.yml b/changelogs/unreleased/an-workhorse-3-8-0.yml
new file mode 100644
index 00000000000..5e2a72e1eda
--- /dev/null
+++ b/changelogs/unreleased/an-workhorse-3-8-0.yml
@@ -0,0 +1,5 @@
+---
+title: Upgrade Workhorse to version 3.8.0 to support structured logging
+merge_request:
+author:
+type: other