summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-07-17 16:57:04 +0300
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-07-17 16:57:04 +0300
commit2bd20b7c4d1c2222f1dce8130c5d5aacc1008aab (patch)
tree3f96dde900fc8623928f2b1c7ca541106b81629d
parent4db9c6e0a8fe23bd517aad3292b7d4063a80ed17 (diff)
downloadgitlab-ce-2bd20b7c4d1c2222f1dce8130c5d5aacc1008aab.tar.gz
Update guide from 6.0 to 7.1
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
-rw-r--r--doc/update/6.0-to-7.1.md (renamed from doc/update/6.0-to-7.0.md)16
1 files changed, 8 insertions, 8 deletions
diff --git a/doc/update/6.0-to-7.0.md b/doc/update/6.0-to-7.1.md
index 881eb2844bb..e328114a673 100644
--- a/doc/update/6.0-to-7.0.md
+++ b/doc/update/6.0-to-7.1.md
@@ -1,8 +1,8 @@
-# From 6.0 to 7.0
+# From 6.0 to 7.1
## Deprecations
-The 'Wall' feature has been removed in GitLab 7.0. Existing wall comments will remain stored in the database after the upgrade.
+The 'Wall' feature has been removed in GitLab 7.1. Existing wall comments will remain stored in the database after the upgrade.
## Global issue numbers
@@ -32,7 +32,7 @@ sudo -u git -H git fetch --all
For GitLab Community Edition:
```bash
-sudo -u git -H git checkout 7-0-stable
+sudo -u git -H git checkout 7-1-stable
```
OR
@@ -40,7 +40,7 @@ OR
For GitLab Enterprise Edition:
```bash
-sudo -u git -H git checkout 7-0-stable-ee
+sudo -u git -H git checkout 7-1-stable-ee
```
@@ -89,12 +89,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 7-0-stable:config/gitlab.yml.example
+git diff 6-0-stable:config/gitlab.yml.example 7-1-stable:config/gitlab.yml.example
```
-* 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.
+* Make `/home/git/gitlab/config/gitlab.yml` the same as https://gitlab.com/gitlab-org/gitlab-ce/blob/7-1-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-1-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-1-stable/lib/support/nginx/gitlab but with your settings.
* Copy rack attack middleware config
```bash