From 983bf359945bc9d4ec1e9581e6bc35dac65e3a3b Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Fri, 22 Nov 2013 15:18:47 +0200 Subject: [PATCH] Fix 6.3 branch name --- doc/update/6.2-to-6.3.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/doc/update/6.2-to-6.3.md b/doc/update/6.2-to-6.3.md index 0e55160..a83eb39 100644 --- a/doc/update/6.2-to-6.3.md +++ b/doc/update/6.2-to-6.3.md @@ -21,7 +21,7 @@ sudo -u git -H bundle exec rake gitlab:backup:create RAILS_ENV=production ```bash cd /home/git/gitlab sudo -u git -H git fetch -sudo -u git -H git checkout 6.3-stable +sudo -u git -H git checkout 6-3-stable ``` ### 3. Update gitlab-shell @@ -62,11 +62,11 @@ sudo -u git -H bundle exec rake cache:clear RAILS_ENV=production TIP: to see what changed in gitlab.yml.example in this release use next command: ``` -git diff 6.2-stable:config/gitlab.yml.example 6.3-stable:config/gitlab.yml.example +git diff 6.2-stable:config/gitlab.yml.example 6-3-stable:config/gitlab.yml.example ``` -* Make `/home/git/gitlab/config/gitlab.yml` same as https://github.com/gitlabhq/gitlabhq/blob/6.3-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.3-stable/config/unicorn.rb.example but with your settings. +* Make `/home/git/gitlab/config/gitlab.yml` same as https://github.com/gitlabhq/gitlabhq/blob/6-3-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-3-stable/config/unicorn.rb.example but with your settings. * Copy rack attack middleware config ```bash @@ -82,7 +82,7 @@ sudo cp lib/support/logrotate/gitlab /etc/logrotate.d/gitlab ```bash sudo rm /etc/init.d/gitlab -sudo curl --output /etc/init.d/gitlab https://raw.github.com/gitlabhq/gitlabhq/6.3-stable/lib/support/init.d/gitlab +sudo curl --output /etc/init.d/gitlab https://raw.github.com/gitlabhq/gitlabhq/6-3-stable/lib/support/init.d/gitlab sudo chmod +x /etc/init.d/gitlab ``` -- libgit2 0.21.2