Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacob Vosmaer <contact@jacobvosmaer.nl>2014-06-20 11:26:12 +0400
committerJacob Vosmaer <contact@jacobvosmaer.nl>2014-06-20 11:26:12 +0400
commit1065f4616c13ff3f344c9ea290ab09c5ca2b2ac7 (patch)
tree20195a171227c3979ee2c508764c0a7da9ff91ce
parente59e48d75a1fba2e0c840acd5bf5125af610297e (diff)
Create 6.0-to-7.0 update guide
-rw-r--r--doc/update/6.0-to-7.0.md (renamed from doc/update/6.0-to-6.8.md)18
1 files changed, 7 insertions, 11 deletions
diff --git a/doc/update/6.0-to-6.8.md b/doc/update/6.0-to-7.0.md
index 0205d0d2e22..7591a9643c0 100644
--- a/doc/update/6.0-to-6.8.md
+++ b/doc/update/6.0-to-7.0.md
@@ -1,8 +1,4 @@
-# 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.**
+# From 6.0 to 7.0
## Deprecations
@@ -34,7 +30,7 @@ sudo -u git -H git fetch --all
For GitLab Community Edition:
```bash
-sudo -u git -H git checkout 6-8-stable
+sudo -u git -H git checkout 7-0-stable
```
OR
@@ -42,7 +38,7 @@ OR
For GitLab Enterprise Edition:
```bash
-sudo -u git -H git checkout 6-8-stable-ee
+sudo -u git -H git checkout 7-0-stable-ee
```
@@ -91,12 +87,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-8-stable:config/gitlab.yml.example
+git diff 6-0-stable:config/gitlab.yml.example 7-0-stable:config/gitlab.yml.example
```
-* 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.
+* Make `/home/git/gitlab/config/gitlab.yml` the same as https://gitlab.com/gitlab-org/gitlab-ce/blob/7-0-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-0-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/7-0-stable/lib/support/nginx/gitlab but with your settings.
* Copy rack attack middleware config
```bash