summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Roemmich <chris@cr-wd.com>2013-08-20 14:13:49 -0500
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-08-22 17:33:02 +0300
commit2afd4aaa1779165e8fb36aeedb456e0b00919b4b (patch)
tree8ea01c26face7785b450288370b290ba55e85e95
parent4c8f3699f1f1334f1b7ed964d4b6ca985796211a (diff)
downloadgitlab-ce-2afd4aaa1779165e8fb36aeedb456e0b00919b4b.tar.gz
Update to gitlab-shell 1.7.0 during 5.4-6.0 update
-rw-r--r--doc/update/5.4-to-6.0.md20
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 5f4e21acb31..23993d05535 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-stable
```
-### 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: