summaryrefslogtreecommitdiff
path: root/doc/update
diff options
context:
space:
mode:
authorPatricio Cano <patricio@gitlab.com>2014-12-17 18:00:43 -0500
committerPatricio Cano <patricio@gitlab.com>2014-12-17 18:00:43 -0500
commit918245094c05d2dfaf566a06e4e4b47cd1e15a27 (patch)
tree5afba5b02cb92b7765be0dc17738b5cdcdafdef9 /doc/update
parentb87c9e289e16260957630089b24baaa1882cdde1 (diff)
downloadgitlab-ce-918245094c05d2dfaf566a06e4e4b47cd1e15a27.tar.gz
Added update guide for updating to 7.6
Diffstat (limited to 'doc/update')
-rw-r--r--doc/update/6.x-or-7.x-to-7.6.md (renamed from doc/update/6.x-or-7.x-to-7.5.md)18
-rw-r--r--doc/update/7.5-to-7.6.md6
2 files changed, 11 insertions, 13 deletions
diff --git a/doc/update/6.x-or-7.x-to-7.5.md b/doc/update/6.x-or-7.x-to-7.6.md
index c9b95c62611..80a7b082261 100644
--- a/doc/update/6.x-or-7.x-to-7.5.md
+++ b/doc/update/6.x-or-7.x-to-7.6.md
@@ -70,7 +70,7 @@ sudo -u git -H git checkout -- db/schema.rb # local changes will be restored aut
For GitLab Community Edition:
```bash
-sudo -u git -H git checkout 7-5-stable
+sudo -u git -H git checkout 7-6-stable
```
OR
@@ -78,7 +78,7 @@ OR
For GitLab Enterprise Edition:
```bash
-sudo -u git -H git checkout 7-5-stable-ee
+sudo -u git -H git checkout 7-6-stable-ee
```
## 4. Install additional packages
@@ -119,7 +119,7 @@ sudo apt-get install pkg-config cmake
```bash
cd /home/git/gitlab-shell
sudo -u git -H git fetch
-sudo -u git -H git checkout v2.2.0
+sudo -u git -H git checkout v2.4.0
```
## 7. Install libs, migrations, etc.
@@ -154,14 +154,14 @@ sudo cp lib/support/init.d/gitlab /etc/init.d/gitlab
TIP: to see what changed in `gitlab.yml.example` in this release use next command:
```
-git diff 6-0-stable:config/gitlab.yml.example 7-5-stable:config/gitlab.yml.example
+git diff 6-0-stable:config/gitlab.yml.example 7-6-stable:config/gitlab.yml.example
```
-* Make `/home/git/gitlab/config/gitlab.yml` the same as https://gitlab.com/gitlab-org/gitlab-ce/blob/7-5-stable/config/gitlab.yml.example but with your settings.
-* Make `/home/git/gitlab/config/unicorn.rb` the same as https://gitlab.com/gitlab-org/gitlab-ce/blob/7-5-stable/config/unicorn.rb.example but with your settings.
-* Make `/home/git/gitlab-shell/config.yml` the same as https://gitlab.com/gitlab-org/gitlab-shell/blob/v2.2.0/config.yml.example but with your settings.
-* HTTP setups: Make `/etc/nginx/sites-available/gitlab` the same as https://gitlab.com/gitlab-org/gitlab-ce/blob/7-5-stable/lib/support/nginx/gitlab but with your settings.
-* HTTPS setups: Make `/etc/nginx/sites-available/gitlab-ssl` the same as https://gitlab.com/gitlab-org/gitlab-ce/blob/7-5-stable/lib/support/nginx/gitlab-ssl but with your settings.
+* Make `/home/git/gitlab/config/gitlab.yml` the same as https://gitlab.com/gitlab-org/gitlab-ce/blob/7-6-stable/config/gitlab.yml.example but with your settings.
+* Make `/home/git/gitlab/config/unicorn.rb` the same as https://gitlab.com/gitlab-org/gitlab-ce/blob/7-6-stable/config/unicorn.rb.example but with your settings.
+* Make `/home/git/gitlab-shell/config.yml` the same as https://gitlab.com/gitlab-org/gitlab-shell/blob/v2.4.0/config.yml.example but with your settings.
+* HTTP setups: Make `/etc/nginx/sites-available/gitlab` the same as https://gitlab.com/gitlab-org/gitlab-ce/blob/7-6-stable/lib/support/nginx/gitlab but with your settings.
+* HTTPS setups: Make `/etc/nginx/sites-available/gitlab-ssl` the same as https://gitlab.com/gitlab-org/gitlab-ce/blob/7-6-stable/lib/support/nginx/gitlab-ssl but with your settings.
* Copy rack attack middleware config
```bash
diff --git a/doc/update/7.5-to-7.6.md b/doc/update/7.5-to-7.6.md
index a5d76c341af..11058c211ca 100644
--- a/doc/update/7.5-to-7.6.md
+++ b/doc/update/7.5-to-7.6.md
@@ -1,7 +1,5 @@
# From 7.5 to 7.6
-**7.6 is not yet released. This is a preliminary upgrade guide.**
-
### 0. Stop server
sudo service gitlab stop
@@ -39,7 +37,7 @@ sudo -u git -H git checkout 7-6-stable-ee
```bash
cd /home/git/gitlab-shell
sudo -u git -H git fetch
-sudo -u git -H git checkout v2.2.0
+sudo -u git -H git checkout v2.4.0
```
### 4. Install libs, migrations, etc.
@@ -72,7 +70,7 @@ sudo cp lib/support/init.d/gitlab /etc/init.d/gitlab
There are new configuration options available for [`gitlab.yml`](config/gitlab.yml.example). View them with the command below and apply them to your current `gitlab.yml`.
```
-git diff origin/7-5-stable:config/gitlab.yml.example origin/7-6-stable:config/gitlab.yml.example
+git diff origin/7-6-stable:config/gitlab.yml.example origin/7-6-stable:config/gitlab.yml.example
```
#### Change Nginx settings