diff options
| author | Jacob Vosmaer (GitLab) <jacob@gitlab.com> | 2016-04-28 14:12:47 +0000 |
|---|---|---|
| committer | Jacob Vosmaer (GitLab) <jacob@gitlab.com> | 2016-04-28 14:12:47 +0000 |
| commit | 872e854840b2436d513bfeefd31c32772970976a (patch) | |
| tree | 735877516557fdf98a2a814ed245673117a3eb0d | |
| parent | a291e0150810857c91d372f58b8251c47695d41d (diff) | |
| parent | d7d644a42814e46915f8517f4fdbc8d10e52cfa5 (diff) | |
| download | gitlab-ce-872e854840b2436d513bfeefd31c32772970976a.tar.gz | |
Merge branch 'prepend-letter-v-to-workhorse-version-numbers' into 'master'
Prepend letter v to GitLab Workhorse version numbers
This helps to address gitlab-org/gitlab-ce#12684 so as to maintain consistency in all GitLab projects.
It also addresses: https://gitlab.com/gitlab-org/gitlab-workhorse/issues/4
Next Steps
- create a set of duplicate tags in workhorse to prevent errors when updating from the patch guide
See merge request !3088
| -rw-r--r-- | doc/update/patch_versions.md | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/update/patch_versions.md b/doc/update/patch_versions.md index f446ed0a35b..60729316cde 100644 --- a/doc/update/patch_versions.md +++ b/doc/update/patch_versions.md @@ -47,7 +47,7 @@ sudo -u git -H git checkout v`cat /home/git/gitlab/GITLAB_SHELL_VERSION` -b v`ca ```bash cd /home/git/gitlab-workhorse sudo -u git -H git fetch -sudo -u git -H git checkout `cat /home/git/gitlab/GITLAB_WORKHORSE_VERSION` -b `cat /home/git/gitlab/GITLAB_WORKHORSE_VERSION` +sudo -u git -H git checkout v`cat /home/git/gitlab/GITLAB_WORKHORSE_VERSION` -b v`cat /home/git/gitlab/GITLAB_WORKHORSE_VERSION` sudo -u git -H make ``` |