summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Speicher <robert@gitlab.com>2016-01-18 17:41:02 +0000
committerRobert Speicher <robert@gitlab.com>2016-01-18 17:41:02 +0000
commitc7d52e563b254b7f04d75305979f6300648fd283 (patch)
treefed67257fac7bca2a0f49ba130fb6470249baea1
parentaf39109be9d4fae9fc2bb249b72edd4f1a4e1720 (diff)
parent4472c07f8149251a755138a9d2910e819bb555c4 (diff)
downloadgitlab-ce-c7d52e563b254b7f04d75305979f6300648fd283.tar.gz
Merge branch 'workhorse-0.6.0' into 'master'
Use gitlab-workhorse 0.6.0 [ci skip] See merge request !2483
-rw-r--r--GITLAB_WORKHORSE_VERSION2
-rw-r--r--doc/update/8.3-to-8.4.md2
2 files changed, 2 insertions, 2 deletions
diff --git a/GITLAB_WORKHORSE_VERSION b/GITLAB_WORKHORSE_VERSION
index 7d8568351b4..a918a2aa18d 100644
--- a/GITLAB_WORKHORSE_VERSION
+++ b/GITLAB_WORKHORSE_VERSION
@@ -1 +1 @@
-0.5.4
+0.6.0
diff --git a/doc/update/8.3-to-8.4.md b/doc/update/8.3-to-8.4.md
index 1cbeab3eca3..604939cd733 100644
--- a/doc/update/8.3-to-8.4.md
+++ b/doc/update/8.3-to-8.4.md
@@ -48,7 +48,7 @@ which should already be on your system from GitLab 8.1.
```bash
cd /home/git/gitlab-workhorse
sudo -u git -H git fetch --all
-sudo -u git -H git checkout 0.5.4
+sudo -u git -H git checkout 0.6.0
sudo -u git -H make
```