From 95ef25a57a872f6cc03416b4c88ca3b17a90f740 Mon Sep 17 00:00:00 2001
From: Jacob Vosmaer <contact@jacobvosmaer.nl>
Date: Fri, 25 Apr 2014 15:01:46 +0200
Subject: [PATCH] Replace 6.0-to-6.7.md with 6.0-to-6.8.md
---
doc/update/{6.0-to-6.7.md => 6.0-to-6.8.md} | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
rename doc/update/{6.0-to-6.7.md => 6.0-to-6.8.md} (85%)
diff --git a/doc/update/6.0-to-6.7.md b/doc/update/6.0-to-6.8.md
similarity index 85%
rename from doc/update/6.0-to-6.7.md
rename to doc/update/6.0-to-6.8.md
index aa1b388fa..97f12d694 100644
--- a/doc/update/6.0-to-6.7.md
+++ b/doc/update/6.0-to-6.8.md
@@ -1,4 +1,4 @@
-# From 6.0 to 6.7
+# From 6.0 to 6.8
# 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.
@@ -33,7 +33,7 @@ sudo -u git -H git fetch --all
For Gitlab Community Edition:
```bash
-sudo -u git -H git checkout 6-7-stable
+sudo -u git -H git checkout 6-8-stable
```
OR
@@ -41,7 +41,7 @@ OR
For GitLab Enterprise Edition:
```bash
-sudo -u git -H git checkout 6-7-stable-ee
+sudo -u git -H git checkout 6-8-stable-ee
```
@@ -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:
```
-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/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/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` 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
```bash
--
2.30.9