From 96ed6c456981f0e71c8629ab6cc464f896b2ca3b Mon Sep 17 00:00:00 2001 From: Jacob Vosmaer Date: Wed, 22 Jan 2014 16:00:50 +0100 Subject: [PATCH] Replace 6.0-to-6.4.md with 6.0-to-6.5.md --- doc/update/{6.0-to-6.4.md => 6.0-to-6.5.md} | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) rename doc/update/{6.0-to-6.4.md => 6.0-to-6.5.md} (91%) diff --git a/doc/update/6.0-to-6.4.md b/doc/update/6.0-to-6.5.md similarity index 91% rename from doc/update/6.0-to-6.4.md rename to doc/update/6.0-to-6.5.md index 1e7af70804b..8b2fcd4854b 100644 --- a/doc/update/6.0-to-6.4.md +++ b/doc/update/6.0-to-6.5.md @@ -1,4 +1,4 @@ -# From 6.0 to 6.4 +# From 6.0 to 6.5 # In 6.1 we remove a lot of deprecated code. # You should update to 6.0 before installing 6.1 or higher so all the necessary conversions are run. @@ -28,8 +28,8 @@ sudo -u git -H bundle exec rake gitlab:backup:create RAILS_ENV=production ```bash cd /home/git/gitlab sudo -u git -H git fetch --all -sudo -u git -H git checkout 6-4-stable -# For GitLab Enterprise Edition: sudo -u git -H git checkout 6-4-stable-ee +sudo -u git -H git checkout 6-5-stable +# For GitLab Enterprise Edition: sudo -u git -H git checkout 6-5-stable-ee ``` @@ -72,11 +72,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-0-stable:config/gitlab.yml.example 6-4-stable:config/gitlab.yml.example +git diff 6-0-stable:config/gitlab.yml.example 6-5-stable:config/gitlab.yml.example ``` -* Make `/home/git/gitlab/config/gitlab.yml` same as https://gitlab.com/gitlab-org/gitlab-ce/blob/6-4-stable/config/gitlab.yml.example but with your settings. -* Make `/home/git/gitlab/config/unicorn.rb` same as https://gitlab.com/gitlab-org/gitlab-ce/blob/6-4-stable/config/unicorn.rb.example but with your settings. +* Make `/home/git/gitlab/config/gitlab.yml` same as https://gitlab.com/gitlab-org/gitlab-ce/blob/6-5-stable/config/gitlab.yml.example but with your settings. +* Make `/home/git/gitlab/config/unicorn.rb` same as https://gitlab.com/gitlab-org/gitlab-ce/blob/6-5-stable/config/unicorn.rb.example but with your settings. * Copy rack attack middleware config ```bash