diff options
| author | Rémy Coutable <remy@rymai.me> | 2018-08-01 16:57:57 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2018-08-01 16:57:57 +0000 |
| commit | 91040069322b3b8da566118b5852a70d5169d7db (patch) | |
| tree | a7317b060791422bfeebb562f4e9e8757291e8ae | |
| parent | f175014067c38f577646d101cc8d32212d582148 (diff) | |
| parent | 90bd6e9daf787fffd1489529da869b908039cb7c (diff) | |
| download | gitlab-ce-91040069322b3b8da566118b5852a70d5169d7db.tar.gz | |
Merge branch 'rjh/pages-update-on-patch-version' into 'master'
Added gitlab-pages update instructions.
See merge request gitlab-org/gitlab-ce!19674
| -rw-r--r-- | doc/update/patch_versions.md | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/doc/update/patch_versions.md b/doc/update/patch_versions.md index e1857ce99c6..a4f17746b69 100644 --- a/doc/update/patch_versions.md +++ b/doc/update/patch_versions.md @@ -92,18 +92,28 @@ sudo -u git -H bundle exec rake "gitlab:gitaly:install[/home/git/gitaly]" RAILS_ cd /home/git/gitlab-shell sudo -u git -H git fetch --all --tags -sudo -u git -H git checkout v`cat /home/git/gitlab/GITLAB_SHELL_VERSION` -b v`cat /home/git/gitlab/GITLAB_SHELL_VERSION` +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' ``` -### 7. Start application +### 7. Update gitlab-pages to the corresponding version (skip if not using pages) + +```bash +cd /home/git/gitlab-pages + +sudo -u git -H git fetch --all --tags +sudo -u git -H git checkout v$(</home/git/gitlab/GITLAB_PAGES_VERSION) +sudo -u git -H make +``` + +### 8. Start application ```bash sudo service gitlab start sudo service nginx restart ``` -### 8. Check application status +### 9. Check application status Check if GitLab and its environment are configured correctly: |