summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Speicher <robert@gitlab.com>2016-12-02 10:37:09 +0000
committerRobert Speicher <robert@gitlab.com>2016-12-02 10:37:09 +0000
commit2394afe4304626130ee70ec095b9d9b399868969 (patch)
treec540265302c97ca74a17967058a8b44bd7ab031c
parentc8fb6f6f37c014c8891e31d48b89ef68d6d8af28 (diff)
parentdbce8432eff53f2b7051be996f8ac3b304e73e0a (diff)
downloadgitlab-ce-2394afe4304626130ee70ec095b9d9b399868969.tar.gz
Merge branch 'workhorse-1.1.0' into 'master'
Use gitlab-workhorse 1.1.0. Adds Prometheus support and more. See merge request !7868
-rw-r--r--GITLAB_WORKHORSE_VERSION2
1 files changed, 1 insertions, 1 deletions
diff --git a/GITLAB_WORKHORSE_VERSION b/GITLAB_WORKHORSE_VERSION
index 7dea76edb3d..9084fa2f716 100644
--- a/GITLAB_WORKHORSE_VERSION
+++ b/GITLAB_WORKHORSE_VERSION
@@ -1 +1 @@
-1.0.1
+1.1.0