Merge branch 'doc/fix_update_doc_links' into 'master'
Fix links in Update guide 5.1 to 6.0 Links have missing slashes and additionally point to `master` branch. This MR prevents a 404 error (missing slash) and points to the correct branch (6-0-stable) for comparison of the config files. /cc @sytse
This commit is contained in:
commit
2bccce2ebf
1 changed files with 3 additions and 3 deletions
|
@ -95,15 +95,15 @@ sudo -u git -H bundle exec rake assets:precompile RAILS_ENV=production
|
|||
|
||||
Note: We switched from Puma in GitLab 5.x to unicorn in GitLab 6.0.
|
||||
|
||||
- Make `/home/git/gitlab/config/gitlab.yml` the same as https://gitlab.com/gitlab-org/gitlab-ce/blob/masterconfig/gitlab.yml.example but with your settings.
|
||||
- Make `/home/git/gitlab/config/unicorn.rb` the same as https://gitlab.com/gitlab-org/gitlab-ce/blob/masterconfig/unicorn.rb.example but with your settings.
|
||||
- Make `/home/git/gitlab/config/gitlab.yml` the same as https://gitlab.com/gitlab-org/gitlab-ce/blob/6-0-stable/config/gitlab.yml.example but with your settings.
|
||||
- Make `/home/git/gitlab/config/unicorn.rb` the same as https://gitlab.com/gitlab-org/gitlab-ce/blob/6-0-stable/config/unicorn.rb.example but with your settings.
|
||||
|
||||
## 7. Update Init script
|
||||
|
||||
```bash
|
||||
cd /home/git/gitlab
|
||||
sudo rm /etc/init.d/gitlab
|
||||
sudo cp lib/support/init.d/gitlab /etc/init.d/gitlab
|
||||
sudo cp lib/support/init.d/gitlab /etc/init.d/gitlab
|
||||
sudo chmod +x /etc/init.d/gitlab
|
||||
```
|
||||
|
||||
|
|
Loading…
Reference in a new issue