From 1065f4616c13ff3f344c9ea290ab09c5ca2b2ac7 Mon Sep 17 00:00:00 2001
From: Jacob Vosmaer <contact@jacobvosmaer.nl>
Date: Fri, 20 Jun 2014 09:26:12 +0200
Subject: [PATCH 1/2] Create 6.0-to-7.0 update guide

---
 doc/update/{6.0-to-6.8.md => 6.0-to-7.0.md} | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)
 rename doc/update/{6.0-to-6.8.md => 6.0-to-7.0.md} (88%)

diff --git a/doc/update/6.0-to-6.8.md b/doc/update/6.0-to-7.0.md
similarity index 88%
rename from doc/update/6.0-to-6.8.md
rename to doc/update/6.0-to-7.0.md
index 0205d0d2e2..7591a9643c 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

From 7d04d460c64874ffd5bd2c4e85ad89c71834f042 Mon Sep 17 00:00:00 2001
From: Jacob Vosmaer <contact@jacobvosmaer.nl>
Date: Fri, 20 Jun 2014 10:44:42 +0200
Subject: [PATCH 2/2] The Wall is deprecated in 7.0

---
 doc/update/6.0-to-7.0.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/doc/update/6.0-to-7.0.md b/doc/update/6.0-to-7.0.md
index 7591a9643c..b73adc8cfb 100644
--- a/doc/update/6.0-to-7.0.md
+++ b/doc/update/6.0-to-7.0.md
@@ -2,6 +2,8 @@
 
 ## Deprecations
 
+The 'Wall' feature has been removed in GitLab 7.0. Existing wall comments will remain stored in the database after the upgrade.
+
 ## Global issue numbers
 
 As of 6.1 issue numbers are project specific. This means all issues are renumbered and get a new number in their URL. If you use an old issue number URL and the issue number does not exist yet you are redirected to the new one. This conversion does not trigger if the old number already exists for this project, this is unlikely but will happen with old issues and large projects.