home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-25 20:46:12 +10:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '7-8-stable' of github.com:gitlabhq/gitlabhq into 7-8-stable

Browse Source
This commit is contained in:
Dmitriy Zaporozhets
2015-02-23 23:30:41 -08:00
parent 3c858eff0c 12bdfe37da
commit b313c8f512
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
doc/update/7.7-to-7.8.md
+4 -4
View File
@@ -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.
@@ -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
@@ -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: