diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-08-20 12:28:19 -0700 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-08-20 12:28:19 -0700 |
| commit | 4873034aa3ef847283a6ae1e89b185f820c6dd84 (patch) | |
| tree | 8e030ab3041efaddc04f40df6764d9db007b343e /doc | |
| parent | 6ad88561d22c4ee1138ba229aeb5a7fc91284204 (diff) | |
| parent | df7d426d2f4b7194e13841213474ee983b999c9a (diff) | |
| download | gitlab-ce-4873034aa3ef847283a6ae1e89b185f820c6dd84.tar.gz | |
Merge pull request #4819 from croemmich/patch-1
Update to gitlab-shell 1.7.0 during 5.4-6.0 update
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/update/5.4-to-6.0.md | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/doc/update/5.4-to-6.0.md b/doc/update/5.4-to-6.0.md index 94799852549..eb8ffb26845 100644 --- a/doc/update/5.4-to-6.0.md +++ b/doc/update/5.4-to-6.0.md @@ -39,14 +39,22 @@ sudo -u git -H git fetch sudo -u git -H git checkout 6-0-dev ``` -### 3. Install additional packages +### 3. Update gitlab-shell + +```bash +cd /home/git/gitlab-shell +sudo -u git -H git fetch +sudo -u git -H git checkout v1.7.0 +``` + +### 4. Install additional packages ```bash # For reStructuredText markup language support install required package: sudo apt-get install python-docutils ``` -### 4. Install libs, migrations, etc. +### 5. Install libs, migrations, etc. ```bash cd /home/git/gitlab @@ -65,14 +73,14 @@ sudo -u git -H bundle exec rake migrate_inline_notes RAILS_ENV=production ``` -### 5. Update config files +### 6. Update config files Note: We switched from Puma in GitLab 5.4 to unicorn in GitLab 6.0. * Make `/home/git/gitlab/config/gitlab.yml` the same as https://github.com/gitlabhq/gitlabhq/blob/master/config/gitlab.yml.example but with your settings. * Make `/home/git/gitlab/config/unicorn.rb` the same as https://github.com/gitlabhq/gitlabhq/blob/master/config/unicorn.rb.example but with your settings. -### 6. Update Init script +### 7. Update Init script ```bash sudo rm /etc/init.d/gitlab @@ -80,12 +88,12 @@ sudo curl --output /etc/init.d/gitlab https://raw.github.com/gitlabhq/gitlabhq/m sudo chmod +x /etc/init.d/gitlab ``` -### 7. Start application +### 8. Start application 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: |