summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Thomas <nick@gitlab.com>2018-11-08 12:59:59 +0000
committerCindy Pallares <cindy@gitlab.com>2018-11-13 21:03:15 -0500
commitbfdf23ccdce37064301fdc69dd719bef6f16fc16 (patch)
tree00ae809b38a00915050ca23bc9781a43d3198d32
parent1dddd492fd6bc2cdf2ef5a003c17125638de9ac3 (diff)
downloadgitlab-ce-bfdf23ccdce37064301fdc69dd719bef6f16fc16.tar.gz
Merge branch 'upgrade-workhorse-7-1-0' into 'master'
Update GitLab-Workhorse to 7.1.0 See merge request gitlab-org/gitlab-ce!22883
-rw-r--r--GITLAB_WORKHORSE_VERSION2
-rw-r--r--changelogs/unreleased/upgrade-workhorse-7-1-0.yml5
2 files changed, 6 insertions, 1 deletions
diff --git a/GITLAB_WORKHORSE_VERSION b/GITLAB_WORKHORSE_VERSION
index 4122521804f..a3fcc7121bb 100644
--- a/GITLAB_WORKHORSE_VERSION
+++ b/GITLAB_WORKHORSE_VERSION
@@ -1 +1 @@
-7.0.0 \ No newline at end of file
+7.1.0
diff --git a/changelogs/unreleased/upgrade-workhorse-7-1-0.yml b/changelogs/unreleased/upgrade-workhorse-7-1-0.yml
new file mode 100644
index 00000000000..b6df35e6d10
--- /dev/null
+++ b/changelogs/unreleased/upgrade-workhorse-7-1-0.yml
@@ -0,0 +1,5 @@
+---
+title: Update GitLab-Workhorse to v7.1.0
+merge_request: 22883
+author:
+type: other