diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-01-03 20:56:22 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-01-03 20:56:22 +0000 |
| commit | 97c9bc056f0e2ec22b4e8ca7abe6badeaf962521 (patch) | |
| tree | 5e465362e8d55f01e18dbae0da728d54a108d878 /doc/update | |
| parent | 904745560aa8665f9076374b2c436329c8d658d3 (diff) | |
| parent | 2cc162d6875540f20617890fc557b0e8dac83e78 (diff) | |
| download | gitlab-ce-97c9bc056f0e2ec22b4e8ca7abe6badeaf962521.tar.gz | |
Merge branch '6-4-fast-track' of /home/git/repositories/gitlab/gitlabhq
Diffstat (limited to 'doc/update')
| -rw-r--r-- | doc/update/6.0-to-6.4.md (renamed from doc/update/6.0-to-6.2.md) | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/doc/update/6.0-to-6.2.md b/doc/update/6.0-to-6.4.md index 03d7e96effe..b784f91cfb6 100644 --- a/doc/update/6.0-to-6.2.md +++ b/doc/update/6.0-to-6.4.md @@ -1,7 +1,4 @@ -# From 6.0 to 6.2 - -## Notice -Security vulnerabilities CVE-2013-4490 and CVE-2013-4489 have been patched in the latest version of GitLab 6.2. +# From 6.0 to 6.4 # 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. @@ -31,7 +28,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-2-stable # Latest version of 6-2-stable addresses CVE-2013-4489 +sudo -u git -H git checkout 6-4-stable ``` @@ -47,7 +44,7 @@ sudo apt-get install logrotate ```bash cd /home/git/gitlab-shell sudo -u git -H git fetch -sudo -u git -H git checkout v1.7.9 # Addresses multiple critical security vulnerabilities +sudo -u git -H git checkout v1.8.0 # Addresses multiple critical security vulnerabilities ``` ### 5. Install libs, migrations, etc. @@ -74,11 +71,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-2-stable:config/gitlab.yml.example +git diff 6-0-stable:config/gitlab.yml.example 6-4-stable:config/gitlab.yml.example ``` -* 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. +* Make `/home/git/gitlab/config/gitlab.yml` same as https://github.com/gitlabhq/gitlabhq/blob/6-4-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-4-stable/config/unicorn.rb.example but with your settings. * Copy rack attack middleware config ```bash @@ -95,7 +92,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-2-stable/lib/support/init.d/gitlab +sudo curl --output /etc/init.d/gitlab https://raw.github.com/gitlabhq/gitlabhq/6-4-stable/lib/support/init.d/gitlab sudo chmod +x /etc/init.d/gitlab ``` |