Download as
Browse Code »

Commit 08538da2c05d8aaddcd408675aab6fb14ea2b740

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

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

Showing 1 changed file with 13 additions and 5 deletions   Show diff stats
doc/update/5.3-to-5.4.md
  Diff comments   View file @08538da
@@ -22,7 +22,15 @@ sudo -u git -H git fetch @@ -22,7 +22,15 @@ sudo -u git -H git fetch
22 sudo -u git -H git checkout 5-4-stable 22 sudo -u git -H git checkout 5-4-stable
23 ``` 23 ```
24 24
25 -### 3. Install libs, migrations, etc. 25 +### 3. Update gitlab-shell
  26 +
  27 +```bash
  28 +cd /home/git/gitlab-shell
  29 +sudo -u git -H git fetch
  30 +sudo -u git -H git checkout v1.5.0
  31 +```
  32 +
  33 +### 4. Install libs, migrations, etc.
26 34
27 ```bash 35 ```bash
28 cd /home/git/gitlab 36 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
38 sudo -u git -H bundle exec rake assets:precompile RAILS_ENV=production 46 sudo -u git -H bundle exec rake assets:precompile RAILS_ENV=production
39 ``` 47 ```
40 48
41 -### 4. Update config files 49 +### 5. Update config files
42 50
43 * 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. 51 * 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.
44 * 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. 52 * 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.
45 53
46 -### 5. Update Init script 54 +### 6. Update Init script
47 55
48 ```bash 56 ```bash
49 sudo rm /etc/init.d/gitlab 57 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
51 sudo chmod +x /etc/init.d/gitlab 59 sudo chmod +x /etc/init.d/gitlab
52 ``` 60 ```
53 61
54 -### 6. Start application 62 +### 7. Start application
55 63
56 sudo service gitlab start 64 sudo service gitlab start
57 sudo service nginx restart 65 sudo service nginx restart
58 66
59 -### 7. Check application status 67 +### 8. Check application status
60 68
61 Check if GitLab and its environment are configured correctly: 69 Check if GitLab and its environment are configured correctly:
62 70