Commit 08538da2 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge branch 'update_gitlab_shell_in_5_4_upgrade' of /home/git/repositories/gitlab/gitlabhq

parents ebf11981 6636c161
...@@ -22,7 +22,15 @@ sudo -u git -H git fetch ...@@ -22,7 +22,15 @@ sudo -u git -H git fetch
sudo -u git -H git checkout 5-4-stable sudo -u git -H git checkout 5-4-stable
``` ```
### 3. Install libs, migrations, etc. ### 3. Update gitlab-shell
```bash
cd /home/git/gitlab-shell
sudo -u git -H git fetch
sudo -u git -H git checkout v1.5.0
```
### 4. Install libs, migrations, etc.
```bash ```bash
cd /home/git/gitlab cd /home/git/gitlab
...@@ -38,12 +46,12 @@ sudo -u git -H bundle exec rake db:migrate RAILS_ENV=production ...@@ -38,12 +46,12 @@ sudo -u git -H bundle exec rake db:migrate RAILS_ENV=production
sudo -u git -H bundle exec rake assets:precompile RAILS_ENV=production sudo -u git -H bundle exec rake assets:precompile RAILS_ENV=production
``` ```
### 4. Update config files ### 5. Update config files
* Make `/home/git/gitlab/config/gitlab.yml` same as https://github.com/gitlabhq/gitlabhq/blob/5-4-stable/config/gitlab.yml.example but with your settings. * Make `/home/git/gitlab/config/gitlab.yml` same as https://github.com/gitlabhq/gitlabhq/blob/5-4-stable/config/gitlab.yml.example but with your settings.
* Make `/home/git/gitlab/config/puma.rb` same as https://github.com/gitlabhq/gitlabhq/blob/5-4-stable/config/puma.rb.example but with your settings. * Make `/home/git/gitlab/config/puma.rb` same as https://github.com/gitlabhq/gitlabhq/blob/5-4-stable/config/puma.rb.example but with your settings.
### 5. Update Init script ### 6. Update Init script
```bash ```bash
sudo rm /etc/init.d/gitlab sudo rm /etc/init.d/gitlab
...@@ -51,12 +59,12 @@ sudo curl --output /etc/init.d/gitlab https://raw.github.com/gitlabhq/gitlabhq/5 ...@@ -51,12 +59,12 @@ sudo curl --output /etc/init.d/gitlab https://raw.github.com/gitlabhq/gitlabhq/5
sudo chmod +x /etc/init.d/gitlab sudo chmod +x /etc/init.d/gitlab
``` ```
### 6. Start application ### 7. Start application
sudo service gitlab start sudo service gitlab start
sudo service nginx restart sudo service nginx restart
### 7. Check application status ### 8. 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