diff options
| author | Rémy Coutable <remy@rymai.me> | 2016-11-25 22:02:03 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-11-25 22:02:03 +0000 |
| commit | 12e856a751a1e8598a7a17998e973874c3391bd1 (patch) | |
| tree | 3266648870b2dafccdfdc5679b9565f7010dde07 | |
| parent | 83ef7c08f373c5a96532ecc16a9200eeaa8f0631 (diff) | |
| parent | 5981a0f365b9a312b87bfcebfb0d9365cb2f9c9a (diff) | |
| download | gitlab-ce-12e856a751a1e8598a7a17998e973874c3391bd1.tar.gz | |
Merge branch 'workhorse-v1.0.1' into 'master'
Update GitLab Workhorse to v1.0.1
v1.0.0 was wrongly tagged, causing compiled gitlab-workhorse binaries to misreport their version number.
Closes https://gitlab.com/gitlab-org/gitlab-workhorse/issues/77
See merge request !7759
| -rw-r--r-- | GITLAB_WORKHORSE_VERSION | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/workhorse-v1-0-1.yml | 4 | ||||
| -rw-r--r-- | doc/install/installation.md | 2 | ||||
| -rw-r--r-- | doc/update/8.13-to-8.14.md | 2 |
4 files changed, 7 insertions, 3 deletions
diff --git a/GITLAB_WORKHORSE_VERSION b/GITLAB_WORKHORSE_VERSION index 3eefcb9dd5b..7dea76edb3d 100644 --- a/GITLAB_WORKHORSE_VERSION +++ b/GITLAB_WORKHORSE_VERSION @@ -1 +1 @@ -1.0.0 +1.0.1 diff --git a/changelogs/unreleased/workhorse-v1-0-1.yml b/changelogs/unreleased/workhorse-v1-0-1.yml new file mode 100644 index 00000000000..c26c2d45b1d --- /dev/null +++ b/changelogs/unreleased/workhorse-v1-0-1.yml @@ -0,0 +1,4 @@ +--- +title: Update GitLab Workhorse to v1.0.1 +merge_request: 7759 +author: diff --git a/doc/install/installation.md b/doc/install/installation.md index dabd69d7466..ee02d6024d9 100644 --- a/doc/install/installation.md +++ b/doc/install/installation.md @@ -403,7 +403,7 @@ If you are not using Linux you may have to run `gmake` instead of cd /home/git sudo -u git -H git clone https://gitlab.com/gitlab-org/gitlab-workhorse.git cd gitlab-workhorse - sudo -u git -H git checkout v1.0.0 + sudo -u git -H git checkout v1.0.1 sudo -u git -H make ### Initialize Database and Activate Advanced Features diff --git a/doc/update/8.13-to-8.14.md b/doc/update/8.13-to-8.14.md index 46ea19d11d0..a0e895773ce 100644 --- a/doc/update/8.13-to-8.14.md +++ b/doc/update/8.13-to-8.14.md @@ -84,7 +84,7 @@ GitLab 8.1. ```bash cd /home/git/gitlab-workhorse sudo -u git -H git fetch --all -sudo -u git -H git checkout v1.0.0 +sudo -u git -H git checkout v1.0.1 sudo -u git -H make ``` |