Commit 97c9bc05 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge branch '6-4-fast-track' of /home/git/repositories/gitlab/gitlabhq

parents 90474556 2cc162d6
# From 6.0 to 6.2 # From 6.0 to 6.4
## Notice
Security vulnerabilities CVE-2013-4490 and CVE-2013-4489 have been patched in the latest version of GitLab 6.2.
# In 6.1 we remove a lot of deprecated code. # 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. # 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 ...@@ -31,7 +28,7 @@ sudo -u git -H bundle exec rake gitlab:backup:create RAILS_ENV=production
```bash ```bash
cd /home/git/gitlab cd /home/git/gitlab
sudo -u git -H git fetch 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 ...@@ -47,7 +44,7 @@ sudo apt-get install logrotate
```bash ```bash
cd /home/git/gitlab-shell cd /home/git/gitlab-shell
sudo -u git -H git fetch 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. ### 5. Install libs, migrations, etc.
...@@ -74,11 +71,11 @@ sudo -u git -H bundle exec rake cache:clear RAILS_ENV=production ...@@ -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: 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/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-2-stable/config/unicorn.rb.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 * Copy rack attack middleware config
```bash ```bash
...@@ -95,7 +92,7 @@ sudo cp lib/support/logrotate/gitlab /etc/logrotate.d/gitlab ...@@ -95,7 +92,7 @@ sudo cp lib/support/logrotate/gitlab /etc/logrotate.d/gitlab
```bash ```bash
sudo rm /etc/init.d/gitlab 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 sudo chmod +x /etc/init.d/gitlab
``` ```
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment