Commit 4873034a authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge pull request #4819 from croemmich/patch-1

Update to gitlab-shell 1.7.0 during 5.4-6.0 update
parents 6ad88561 df7d426d
...@@ -39,14 +39,22 @@ sudo -u git -H git fetch ...@@ -39,14 +39,22 @@ sudo -u git -H git fetch
sudo -u git -H git checkout 6-0-dev 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 ```bash
# For reStructuredText markup language support install required package: # For reStructuredText markup language support install required package:
sudo apt-get install python-docutils sudo apt-get install python-docutils
``` ```
### 4. Install libs, migrations, etc. ### 5. Install libs, migrations, etc.
```bash ```bash
cd /home/git/gitlab cd /home/git/gitlab
...@@ -65,14 +73,14 @@ sudo -u git -H bundle exec rake migrate_inline_notes RAILS_ENV=production ...@@ -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. 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/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. * 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 ```bash
sudo rm /etc/init.d/gitlab sudo rm /etc/init.d/gitlab
...@@ -80,12 +88,12 @@ sudo curl --output /etc/init.d/gitlab https://raw.github.com/gitlabhq/gitlabhq/m ...@@ -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 sudo chmod +x /etc/init.d/gitlab
``` ```
### 7. Start application ### 8. Start application
sudo service gitlab start sudo service gitlab start
sudo service nginx restart sudo service nginx restart
### 8. Check application status ### 9. Check application status
Check if GitLab and its environment are configured correctly: Check if GitLab and its environment are configured correctly:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment