Commit ca907e4f9f37acac51b60bd95fb495780e4c9a84
1 parent
6bd114a7
Exists in
spb-stable
and in
2 other branches
Make it more obvious that GitLab Shell should be upgraded.
Showing
1 changed file
with
6 additions
and
8 deletions
Show diff stats
doc/update/upgrader.md
| @@ -31,19 +31,16 @@ __GitLab Upgrader is available only for GitLab version 6.4.2 or higher__ | @@ -31,19 +31,16 @@ __GitLab Upgrader is available only for GitLab version 6.4.2 or higher__ | ||
| 31 | 31 | ||
| 32 | ### 4. Check application status | 32 | ### 4. Check application status |
| 33 | 33 | ||
| 34 | -Check if GitLab and its environment are configured correctly: | ||
| 35 | - | ||
| 36 | - sudo -u git -H bundle exec rake gitlab:env:info RAILS_ENV=production | ||
| 37 | - | ||
| 38 | -To make sure you didn't miss anything run a more thorough check with: | 34 | +Check if GitLab and its dependencies are configured correctly: |
| 39 | 35 | ||
| 40 | sudo -u git -H bundle exec rake gitlab:check RAILS_ENV=production | 36 | sudo -u git -H bundle exec rake gitlab:check RAILS_ENV=production |
| 41 | 37 | ||
| 42 | If all items are green, then congratulations upgrade is complete! | 38 | If all items are green, then congratulations upgrade is complete! |
| 43 | 39 | ||
| 44 | -### (optional) 5. Application status check fails | 40 | +### 5. Upgrade GitLab Shell (if needed) |
| 45 | 41 | ||
| 46 | -If the `gitlab:check` task reports an old version of gitlab-shell and recommends upgrading, upgrade gitlab-shell by running: | 42 | +If the `gitlab:check` task reports an outdated version of gitlab-shell you should upgrade it. |
| 43 | +Upgrade it by running the commands below after replacing 1.9.4 with the correct version number: | ||
| 47 | 44 | ||
| 48 | ``` | 45 | ``` |
| 49 | cd /home/git/gitlab-shell | 46 | cd /home/git/gitlab-shell |
| @@ -53,7 +50,8 @@ sudo -u git -H git checkout v1.9.4 | @@ -53,7 +50,8 @@ sudo -u git -H git checkout v1.9.4 | ||
| 53 | 50 | ||
| 54 | ### One line upgrade command | 51 | ### One line upgrade command |
| 55 | 52 | ||
| 56 | -You've read through the entire guide, and probably did all the steps manually. Here is a one liner for convenience, the next time you upgrade: | 53 | +You've read through the entire guide and probably already did all the steps one by one. |
| 54 | +Here is a one line command with step 1 to 4 for the next time you upgrade: | ||
| 57 | 55 | ||
| 58 | ```bash | 56 | ```bash |
| 59 | cd /home/git/gitlab; sudo -u git -H bundle exec rake gitlab:backup:create RAILS_ENV=production; \ | 57 | cd /home/git/gitlab; sudo -u git -H bundle exec rake gitlab:backup:create RAILS_ENV=production; \ |