Commit 27f31a7e authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge branch 'update/6.0-to-6.8' into 'master'

Replace 6.0-to-6.7.md with 6.0-to-6.8.md
parents e4c8e8fd bdd392bd
# From 6.0 to 6.7 # From 6.0 to 6.8
# 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.
...@@ -33,7 +33,7 @@ sudo -u git -H git fetch --all ...@@ -33,7 +33,7 @@ sudo -u git -H git fetch --all
For Gitlab Community Edition: For Gitlab Community Edition:
```bash ```bash
sudo -u git -H git checkout 6-7-stable sudo -u git -H git checkout 6-8-stable
``` ```
OR OR
...@@ -41,7 +41,7 @@ OR ...@@ -41,7 +41,7 @@ OR
For GitLab Enterprise Edition: For GitLab Enterprise Edition:
```bash ```bash
sudo -u git -H git checkout 6-7-stable-ee sudo -u git -H git checkout 6-8-stable-ee
``` ```
...@@ -57,7 +57,7 @@ sudo apt-get install logrotate ...@@ -57,7 +57,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.9.1 # Addresses multiple critical security vulnerabilities sudo -u git -H git checkout v1.9.3 # Addresses multiple critical security vulnerabilities
``` ```
### 5. Install libs, migrations, etc. ### 5. Install libs, migrations, etc.
...@@ -90,11 +90,12 @@ sudo chmod u+rwx,g+rx,o-rwx /home/git/gitlab-satellites ...@@ -90,11 +90,12 @@ sudo chmod u+rwx,g+rx,o-rwx /home/git/gitlab-satellites
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-7-stable:config/gitlab.yml.example git diff 6-0-stable:config/gitlab.yml.example 6-8-stable:config/gitlab.yml.example
``` ```
* Make `/home/git/gitlab/config/gitlab.yml` same as https://gitlab.com/gitlab-org/gitlab-ce/blob/6-7-stable/config/gitlab.yml.example but with your settings. * Make `/home/git/gitlab/config/gitlab.yml` the same as https://gitlab.com/gitlab-org/gitlab-ce/blob/6-8-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-7-stable/config/unicorn.rb.example but with your settings. * Make `/home/git/gitlab/config/unicorn.rb` the same as https://gitlab.com/gitlab-org/gitlab-ce/blob/6-8-stable/config/unicorn.rb.example but with your settings.
* Make `/etc/nginx/sites-available/nginx` the same as https://gitlab.com/gitlab-org/gitlab-ce/blob/6-8-stable/lib/support/nginx/gitlab but with your settings.
* Copy rack attack middleware config * Copy rack attack middleware config
```bash ```bash
......
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