summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Speicher <rspeicher@gmail.com>2018-12-10 21:58:24 +0000
committerRobert Speicher <rspeicher@gmail.com>2018-12-10 21:58:24 +0000
commit77a21b2ab0ea8366a6f570d2bd3d0fa610c7b345 (patch)
tree90c5f5939fdef039e2bd97ce87e3922bf8ffede6
parentec76f4fd905c04706447dffee4f8061a2b8d4e1e (diff)
parent99b1c343600075a8421d3898e9ad64d4bba0f007 (diff)
downloadgitlab-ce-77a21b2ab0ea8366a6f570d2bd3d0fa610c7b345.tar.gz
Merge branch 'upgrade-to-workhorse-7.6.0' into 'master'
Upgrade to workhorse 7.6.0: See merge request gitlab-org/gitlab-ce!23694
-rw-r--r--GITLAB_WORKHORSE_VERSION2
-rw-r--r--changelogs/unreleased/upgrade-to-workhorse-7-6-0.yml5
2 files changed, 6 insertions, 1 deletions
diff --git a/GITLAB_WORKHORSE_VERSION b/GITLAB_WORKHORSE_VERSION
index 18bb4182dd0..93c8ddab9fe 100644
--- a/GITLAB_WORKHORSE_VERSION
+++ b/GITLAB_WORKHORSE_VERSION
@@ -1 +1 @@
-7.5.0
+7.6.0
diff --git a/changelogs/unreleased/upgrade-to-workhorse-7-6-0.yml b/changelogs/unreleased/upgrade-to-workhorse-7-6-0.yml
new file mode 100644
index 00000000000..1389693b9a9
--- /dev/null
+++ b/changelogs/unreleased/upgrade-to-workhorse-7-6-0.yml
@@ -0,0 +1,5 @@
+---
+title: Upgrade workhorse to 7.6.0
+merge_request: 23694
+author:
+type: other