diff options
| author | Jeroen van Baarsen <jeroenvanbaarsen@gmail.com> | 2014-07-17 10:07:05 +0000 |
|---|---|---|
| committer | Jeroen van Baarsen <jeroenvanbaarsen@gmail.com> | 2014-07-17 10:07:05 +0000 |
| commit | 2bccce2ebf46b7b09e68dd2ab4ae8b51b99bbc55 (patch) | |
| tree | cddd9eee940564c0a9c8071b9f0e4b3ece075e0a | |
| parent | 9054430583ca9e5cfe256dccaf05e2923fb28925 (diff) | |
| parent | 3aea2f6fe1f0cb968778c5b6f1d048c5d1d9f1fc (diff) | |
| download | gitlab-ce-2bccce2ebf46b7b09e68dd2ab4ae8b51b99bbc55.tar.gz | |
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
| -rw-r--r-- | doc/update/5.1-to-6.0.md | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/doc/update/5.1-to-6.0.md b/doc/update/5.1-to-6.0.md index 11afc75f0f3..d8484b2c650 100644 --- a/doc/update/5.1-to-6.0.md +++ b/doc/update/5.1-to-6.0.md @@ -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 ``` |