diff --git a/doc/update/6.1-to-6.2.md b/doc/update/6.1-to-6.2.md index 9f3a869..b46ade1 100644 --- a/doc/update/6.1-to-6.2.md +++ b/doc/update/6.1-to-6.2.md @@ -24,15 +24,7 @@ sudo -u git -H git fetch sudo -u git -H git checkout 6-2-stable ``` -### 3. Update gitlab-shell - -```bash -cd /home/git/gitlab-shell -sudo -u git -H git fetch -sudo -u git -H git checkout v1.7.1 -``` - -### 4. Install libs, migrations, etc. +### 3. Install libs, migrations, etc. ```bash cd /home/git/gitlab @@ -45,13 +37,12 @@ sudo -u git -H bundle install --without development test mysql --deployment sudo -u git -H bundle exec rake db:migrate RAILS_ENV=production -sudo -u git -H bundle exec rake migrate_iids RAILS_ENV=production sudo -u git -H bundle exec rake assets:clean RAILS_ENV=production sudo -u git -H bundle exec rake assets:precompile RAILS_ENV=production sudo -u git -H bundle exec rake cache:clear RAILS_ENV=production ``` -### 5. Update config files +### 4. Update config files * 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. * 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 ``` * Uncomment `config.middleware.use Rack::Attack` in `/home/git/gitlab/config/application.rb` -### 6. Update Init script +### 5. Update Init script ```bash sudo rm /etc/init.d/gitlab @@ -69,12 +60,12 @@ sudo curl --output /etc/init.d/gitlab https://raw.github.com/gitlabhq/gitlabhq/6 sudo chmod +x /etc/init.d/gitlab ``` -### 7. Start application +### 6. Start application sudo service gitlab start sudo service nginx restart -### 8. Check application status +### 7. Check application status Check if GitLab and its environment are configured correctly: -- libgit2 0.21.2