diff options
author | Robert Speicher <robert@gitlab.com> | 2016-01-18 17:41:02 +0000 |
---|---|---|
committer | Robert Speicher <rspeicher@gmail.com> | 2016-01-18 12:42:02 -0500 |
commit | 928303ce502f3491f9f3947c5e9cb841ccf07413 (patch) | |
tree | e1e0870671bf50be145e9ccb17e91f41a0a42f68 | |
parent | 0b7e1e9eb289ef477ce443f267a410eb4355ab66 (diff) | |
download | gitlab-ce-928303ce502f3491f9f3947c5e9cb841ccf07413.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_VERSION | 2 | ||||
-rw-r--r-- | doc/update/8.3-to-8.4.md | 2 |
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 ``` |