Download as
Browse Code »

Commit 17df09b79ee10ef9c1fdeb8593337745768ef6f9

Authored by Dmitriy Zaporozhets
1 parent f4733b00
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Remove unnecessary steps from update 6.1-6.2

Showing 1 changed file with 5 additions and 14 deletions   Show diff stats
doc/update/6.1-to-6.2.md
  Diff comments   View file @17df09b
@@ -24,15 +24,7 @@ sudo -u git -H git fetch @@ -24,15 +24,7 @@ sudo -u git -H git fetch
24 sudo -u git -H git checkout 6-2-stable 24 sudo -u git -H git checkout 6-2-stable
25 ``` 25 ```
26 26
27 -### 3. Update gitlab-shell  
28 -  
29 -```bash  
30 -cd /home/git/gitlab-shell  
31 -sudo -u git -H git fetch  
32 -sudo -u git -H git checkout v1.7.1  
33 -```  
34 -  
35 -### 4. Install libs, migrations, etc. 27 +### 3. Install libs, migrations, etc.
36 28
37 ```bash 29 ```bash
38 cd /home/git/gitlab 30 cd /home/git/gitlab
@@ -45,13 +37,12 @@ sudo -u git -H bundle install --without development test mysql --deployment @@ -45,13 +37,12 @@ sudo -u git -H bundle install --without development test mysql --deployment
45 37
46 38
47 sudo -u git -H bundle exec rake db:migrate RAILS_ENV=production 39 sudo -u git -H bundle exec rake db:migrate RAILS_ENV=production
48 -sudo -u git -H bundle exec rake migrate_iids RAILS_ENV=production  
49 sudo -u git -H bundle exec rake assets:clean RAILS_ENV=production 40 sudo -u git -H bundle exec rake assets:clean RAILS_ENV=production
50 sudo -u git -H bundle exec rake assets:precompile RAILS_ENV=production 41 sudo -u git -H bundle exec rake assets:precompile RAILS_ENV=production
51 sudo -u git -H bundle exec rake cache:clear RAILS_ENV=production 42 sudo -u git -H bundle exec rake cache:clear RAILS_ENV=production
52 ``` 43 ```
53 44
54 -### 5. Update config files 45 +### 4. Update config files
55 46
56 * Make `/home/git/gitlab/config/gitlab.yml` same as https://github.com/gitlabhq/gitlabhq/blob/6-2-stable/config/gitlab.yml.example but with your settings. 47 * Make `/home/git/gitlab/config/gitlab.yml` same as https://github.com/gitlabhq/gitlabhq/blob/6-2-stable/config/gitlab.yml.example but with your settings.
57 * Make `/home/git/gitlab/config/unicorn.rb` same as https://github.com/gitlabhq/gitlabhq/blob/6-2-stable/config/unicorn.rb.example but with your settings. 48 * Make `/home/git/gitlab/config/unicorn.rb` same as https://github.com/gitlabhq/gitlabhq/blob/6-2-stable/config/unicorn.rb.example but with your settings.
@@ -61,7 +52,7 @@ sudo -u git -H cp config/initializers/rack_attack.rb.example config/initializers @@ -61,7 +52,7 @@ sudo -u git -H cp config/initializers/rack_attack.rb.example config/initializers
61 ``` 52 ```
62 * Uncomment `config.middleware.use Rack::Attack` in `/home/git/gitlab/config/application.rb` 53 * Uncomment `config.middleware.use Rack::Attack` in `/home/git/gitlab/config/application.rb`
63 54
64 -### 6. Update Init script 55 +### 5. Update Init script
65 56
66 ```bash 57 ```bash
67 sudo rm /etc/init.d/gitlab 58 sudo rm /etc/init.d/gitlab
@@ -69,12 +60,12 @@ sudo curl --output /etc/init.d/gitlab https://raw.github.com/gitlabhq/gitlabhq/6 @@ -69,12 +60,12 @@ sudo curl --output /etc/init.d/gitlab https://raw.github.com/gitlabhq/gitlabhq/6
69 sudo chmod +x /etc/init.d/gitlab 60 sudo chmod +x /etc/init.d/gitlab
70 ``` 61 ```
71 62
72 -### 7. Start application 63 +### 6. Start application
73 64
74 sudo service gitlab start 65 sudo service gitlab start
75 sudo service nginx restart 66 sudo service nginx restart
76 67
77 -### 8. Check application status 68 +### 7. Check application status
78 69
79 Check if GitLab and its environment are configured correctly: 70 Check if GitLab and its environment are configured correctly:
80 71