Download as
Browse Code »

Commit 4873034aa3ef847283a6ae1e89b185f820c6dd84

Authored by Dmitriy Zaporozhets
2 parents 6ad88561 df7d426d
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Merge pull request #4819 from croemmich/patch-1 

Update to gitlab-shell 1.7.0 during 5.4-6.0 update
Showing 1 changed file with 14 additions and 6 deletions   Show diff stats
doc/update/5.4-to-6.0.md
  Diff comments   View file @4873034
@@ -39,14 +39,22 @@ sudo -u git -H git fetch @@ -39,14 +39,22 @@ sudo -u git -H git fetch
39 sudo -u git -H git checkout 6-0-dev 39 sudo -u git -H git checkout 6-0-dev
40 ``` 40 ```
41 41
42 -### 3. Install additional packages 42 +### 3. Update gitlab-shell
  43 +
  44 +```bash
  45 +cd /home/git/gitlab-shell
  46 +sudo -u git -H git fetch
  47 +sudo -u git -H git checkout v1.7.0
  48 +```
  49 +
  50 +### 4. Install additional packages
43 51
44 ```bash 52 ```bash
45 # For reStructuredText markup language support install required package: 53 # For reStructuredText markup language support install required package:
46 sudo apt-get install python-docutils 54 sudo apt-get install python-docutils
47 ``` 55 ```
48 56
49 -### 4. Install libs, migrations, etc. 57 +### 5. Install libs, migrations, etc.
50 58
51 ```bash 59 ```bash
52 cd /home/git/gitlab 60 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
65 73
66 ``` 74 ```
67 75
68 -### 5. Update config files 76 +### 6. Update config files
69 77
70 Note: We switched from Puma in GitLab 5.4 to unicorn in GitLab 6.0. 78 Note: We switched from Puma in GitLab 5.4 to unicorn in GitLab 6.0.
71 79
72 * 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. 80 * 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.
73 * 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. 81 * 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.
74 82
75 -### 6. Update Init script 83 +### 7. Update Init script
76 84
77 ```bash 85 ```bash
78 sudo rm /etc/init.d/gitlab 86 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
80 sudo chmod +x /etc/init.d/gitlab 88 sudo chmod +x /etc/init.d/gitlab
81 ``` 89 ```
82 90
83 -### 7. Start application 91 +### 8. Start application
84 92
85 sudo service gitlab start 93 sudo service gitlab start
86 sudo service nginx restart 94 sudo service nginx restart
87 95
88 -### 8. Check application status 96 +### 9. Check application status
89 97
90 Check if GitLab and its environment are configured correctly: 98 Check if GitLab and its environment are configured correctly:
91 99