summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Speicher <rspeicher@gmail.com>2018-12-10 21:58:24 +0000
committerYorick Peterse <yorickpeterse@gmail.com>2018-12-17 16:11:40 +0100
commit73efb8fb65e247ea107631760e7c41186aa900c4 (patch)
tree3752dec79a46cd8b19d77f01460bd77ecc82a22b
parent94c4d4e30aeb6441ce87efc673953bfbeb896be0 (diff)
downloadgitlab-ce-73efb8fb65e247ea107631760e7c41186aa900c4.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