diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-04 15:06:14 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-04 15:06:14 +0300 |
| commit | 0d46bf06388d485824bc2f1e736b92b2a8a397e4 (patch) | |
| tree | 626a835841722463da4def7905b95e874eb77578 /doc/update | |
| parent | 1f1bdf54e1974f89f3a6ba734ec2c42552e90639 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/update')
| -rw-r--r-- | doc/update/patch_versions.md | 2 | ||||
| -rw-r--r-- | doc/update/upgrading_from_source.md | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/doc/update/patch_versions.md b/doc/update/patch_versions.md index 73677b019eb..7314e34666d 100644 --- a/doc/update/patch_versions.md +++ b/doc/update/patch_versions.md @@ -87,7 +87,7 @@ cd /home/git/gitlab-shell sudo -u git -H git fetch --all --tags sudo -u git -H git checkout v$(</home/git/gitlab/GITLAB_SHELL_VERSION) -b v$(</home/git/gitlab/GITLAB_SHELL_VERSION) -sudo -u git -H sh -c 'if [ -x bin/compile ]; then bin/compile; fi' +sudo -u git -H make build ``` ### 7. Update GitLab Pages to the corresponding version (skip if not using pages) diff --git a/doc/update/upgrading_from_source.md b/doc/update/upgrading_from_source.md index d8c06f372b6..662701dbb56 100644 --- a/doc/update/upgrading_from_source.md +++ b/doc/update/upgrading_from_source.md @@ -193,7 +193,7 @@ cd /home/git/gitlab-shell sudo -u git -H git fetch --all --tags --prune sudo -u git -H git checkout v$(</home/git/gitlab/GITLAB_SHELL_VERSION) -sudo -u git -H bin/compile +sudo -u git -H make build ``` ### 9. Update GitLab Workhorse |