diff options
| author | Robert Schilling <rschilling@student.tugraz.at> | 2014-08-19 14:53:37 +0200 |
|---|---|---|
| committer | Robert Schilling <rschilling@student.tugraz.at> | 2014-08-19 15:20:57 +0200 |
| commit | 794a8d8187a9fefc7908307ac9d995f4262aae8a (patch) | |
| tree | 68c7de800f01ac346ea6ccd3560c429ab5db628b | |
| parent | 3f161a3a3d1c2411cd80260a6eaf13eb608e0ce3 (diff) | |
| download | gitlab-ce-794a8d8187a9fefc7908307ac9d995f4262aae8a.tar.gz | |
Mention Google OAuth API change in update guides
Add oauth doc to 6.0 to 7.2 upgrader
| -rw-r--r-- | doc/update/6.0-to-7.2.md | 10 | ||||
| -rw-r--r-- | doc/update/7.1-to-7.2.md | 6 |
2 files changed, 14 insertions, 2 deletions
diff --git a/doc/update/6.0-to-7.2.md b/doc/update/6.0-to-7.2.md index 41ff6283603..913768aee07 100644 --- a/doc/update/6.0-to-7.2.md +++ b/doc/update/6.0-to-7.2.md @@ -84,7 +84,7 @@ sudo chmod u+rwx,g+rx,o-rwx /home/git/gitlab-satellites ## 6. Update config files -TIP: to see what changed in gitlab.yml.example in this release use next command: +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-2-stable:config/gitlab.yml.example @@ -129,6 +129,12 @@ To make sure you didn't miss anything run a more thorough check with: If all items are green, then congratulations upgrade complete! +## 10. Update OmniAuth configuration + +When using Google omniauth login, changes of the Google account required. +Ensure that `Contacts API` and the `Google+ API` are enabled in the [Google Developers Console](https://console.developers.google.com/). +More details can be found at the [integration documentation](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/integration/google.md). + ## Things went south? Revert to previous version (6.0) ### 1. Revert the code to the previous version @@ -144,4 +150,4 @@ sudo -u git -H bundle exec rake gitlab:backup:restore RAILS_ENV=production ## Login issues after upgrade? -If running in HTTPS mode, be sure to read [Can't Verify CSRF token authenticity](https://github.com/gitlabhq/gitlab-public-wiki/wiki/Trouble-Shooting-Guide#cant-verify-csrf-token-authenticitycant-get-past-login-pageredirected-to-login-page) +If running in HTTPS mode, be sure to read [Can't Verify CSRF token authenticity](https://github.com/gitlabhq/gitlab-public-wiki/wiki/Trouble-Shooting-Guide#cant-verify-csrf-token-authenticitycant-get-past-login-pageredirected-to-login-page) diff --git a/doc/update/7.1-to-7.2.md b/doc/update/7.1-to-7.2.md index be28944a8fe..40698e80929 100644 --- a/doc/update/7.1-to-7.2.md +++ b/doc/update/7.1-to-7.2.md @@ -91,6 +91,12 @@ To make sure you didn't miss anything run a more thorough check with: If all items are green, then congratulations upgrade is complete! +### 8. Update OmniAuth configuration + +When using Google omniauth login, changes of the Google account required. +Ensure that `Contacts API` and the `Google+ API` are enabled in the [Google Developers Console](https://console.developers.google.com/). +More details can be found at the [integration documentation](../integration/google.md). + ## Things went south? Revert to previous version (7.1) ### 1. Revert the code to the previous version |