From 825919aa99ef23837b890ec937adac57f21127e9 Mon Sep 17 00:00:00 2001 From: Robert Schilling Date: Sun, 22 Feb 2015 10:54:28 +0100 Subject: [PATCH 1/2] Update gitlab-shell to 2.5.3 in 7-8 update guide, fixes #8838 --- doc/update/7.7-to-7.8.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/update/7.7-to-7.8.md b/doc/update/7.7-to-7.8.md index 7ca0fe6578..c6bf5b227e 100644 --- a/doc/update/7.7-to-7.8.md +++ b/doc/update/7.7-to-7.8.md @@ -37,7 +37,7 @@ sudo -u git -H git checkout 7-8-stable-ee ```bash cd /home/git/gitlab-shell sudo -u git -H git fetch -sudo -u git -H git checkout v2.4.3 +sudo -u git -H git checkout v2.5.3 ``` ### 4. Install libs, migrations, etc. @@ -105,10 +105,10 @@ If all items are green, then congratulations upgrade is complete! If you are using GitHub as an OAuth provider for authentication, you should change the callback URL so that it only contains a root URL (ex. `https://gitlab.example.com/`) -## Things went south? Revert to previous version (7.6) +## Things went south? Revert to previous version (7.7) ### 1. Revert the code to the previous version -Follow the [upgrade guide from 7.5 to 7.6](7.5-to-7.6.md), except for the database migration +Follow the [upgrade guide from 7.6 to 7.7](7.6-to-7.7.md), except for the database migration (The backup is already migrated to the previous version) ### 2. Restore from the backup: From 12bdfe37dad7108fc5fb6f40d65b8979406b9626 Mon Sep 17 00:00:00 2001 From: Patrik Kernstock Date: Sun, 22 Feb 2015 21:39:13 +0100 Subject: [PATCH 2/2] Update 7.7-to-7.8.md --- doc/update/7.7-to-7.8.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/update/7.7-to-7.8.md b/doc/update/7.7-to-7.8.md index c6bf5b227e..a8a5c7f66c 100644 --- a/doc/update/7.7-to-7.8.md +++ b/doc/update/7.7-to-7.8.md @@ -70,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-6-stable:config/gitlab.yml.example origin/7-8-stable:config/gitlab.yml.example +git diff origin/7-7-stable:config/gitlab.yml.example origin/7-8-stable:config/gitlab.yml.example ``` #### Change Nginx settings