diff options
author | Job van der Voort <job@gitlab.com> | 2014-12-18 13:07:44 +0000 |
---|---|---|
committer | Job van der Voort <job@gitlab.com> | 2014-12-18 13:07:44 +0000 |
commit | 1524e2171aa4ab4bb1aab629c41b382dba77e143 (patch) | |
tree | 977772e632424a758e4dec888a92d0933ff92fb0 /doc/update/7.5-to-7.6.md | |
parent | b87c9e289e16260957630089b24baaa1882cdde1 (diff) | |
parent | 7813363fd79d758980d30354aea0d0d21af92612 (diff) | |
download | gitlab-ce-1524e2171aa4ab4bb1aab629c41b382dba77e143.tar.gz |
Merge branch 'update-doc-7-6' into 'master'
Update Documentation for 7.6 release
Updated the update and install documentation for the 7.6 release.
See merge request !1334
Diffstat (limited to 'doc/update/7.5-to-7.6.md')
-rw-r--r-- | doc/update/7.5-to-7.6.md | 6 |
1 files changed, 2 insertions, 4 deletions
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 |