summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Thomas <nick@gitlab.com>2018-03-07 17:04:42 +0000
committerNick Thomas <nick@gitlab.com>2018-03-07 17:04:42 +0000
commit98c8c90e92f8f0407bf048d42ff5e4d76ce57ba0 (patch)
treef7c66bcd543f8e92f788d9f2f4cb9ef6894d1c90
parentce819eceea58f1452f59ffc275a4c8cb6c5da0d8 (diff)
parent65c075455077284a4dc0848c7508cce73392ec0f (diff)
downloadgitlab-ce-98c8c90e92f8f0407bf048d42ff5e4d76ce57ba0.tar.gz
Merge branch 'upgrade-workhorse-4.0.0' into 'master'
Upgrade Workhorse to 4.0.0 See merge request gitlab-org/gitlab-ce!17606
-rw-r--r--GITLAB_WORKHORSE_VERSION2
-rw-r--r--changelogs/unreleased/upgrade-workhorse-4-0-0.yml5
2 files changed, 6 insertions, 1 deletions
diff --git a/GITLAB_WORKHORSE_VERSION b/GITLAB_WORKHORSE_VERSION
index 19811903a7f..fcdb2e109f6 100644
--- a/GITLAB_WORKHORSE_VERSION
+++ b/GITLAB_WORKHORSE_VERSION
@@ -1 +1 @@
-3.8.0
+4.0.0
diff --git a/changelogs/unreleased/upgrade-workhorse-4-0-0.yml b/changelogs/unreleased/upgrade-workhorse-4-0-0.yml
new file mode 100644
index 00000000000..f9dbdc7fc56
--- /dev/null
+++ b/changelogs/unreleased/upgrade-workhorse-4-0-0.yml
@@ -0,0 +1,5 @@
+---
+title: Upgrade GitLab Workhorse to 4.0.0
+merge_request:
+author:
+type: added