diff options
| author | Dmitriy Zaporozhets <dzaporozhets@gitlab.com> | 2015-01-19 20:59:09 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dzaporozhets@gitlab.com> | 2015-01-19 20:59:09 +0000 |
| commit | 20477eb5caeae80ff7dd7e09e2d68278da629ce2 (patch) | |
| tree | a2c4badc1c9d72ca470125c882d80fcd3957c47a | |
| parent | 0166d8d8e53ff67fb3bc759fa6a8e0aa0bb3edda (diff) | |
| parent | d5ae521cf798a4c553fcf836b51a28b65cd46da7 (diff) | |
| download | gitlab-ce-20477eb5caeae80ff7dd7e09e2d68278da629ce2.tar.gz | |
Merge branch 'update_oauth_documentation' into 'master'
Update oauth documentation
See merge request !1411
| -rw-r--r-- | doc/integration/github.md | 2 | ||||
| -rw-r--r-- | doc/integration/github_app.png | bin | 75607 -> 75297 bytes | |||
| -rw-r--r-- | doc/update/7.6-to-7.7.md | 5 |
3 files changed, 6 insertions, 1 deletions
diff --git a/doc/integration/github.md b/doc/integration/github.md index 714593d8266..a586334b98d 100644 --- a/doc/integration/github.md +++ b/doc/integration/github.md @@ -14,7 +14,7 @@ To enable the GitHub OmniAuth provider you must register your application with G - Application name: This can be anything. Consider something like "\<Organization\>'s GitLab" or "\<Your Name\>'s GitLab" or something else descriptive. - Homepage URL: The URL to your GitLab installation. 'https://gitlab.company.com' - Application description: Fill this in if you wish. - - Authorization callback URL: 'https://gitlab.company.com/users/auth/github/callback' + - Authorization callback URL: 'https://gitlab.company.com/' 1. Select "Register application". 1. You should now see a Client ID and Client Secret near the top right of the page (see screenshot). Keep this page open as you continue configuration.  diff --git a/doc/integration/github_app.png b/doc/integration/github_app.png Binary files differindex c0873b2e20d..d890345ced9 100644 --- a/doc/integration/github_app.png +++ b/doc/integration/github_app.png diff --git a/doc/update/7.6-to-7.7.md b/doc/update/7.6-to-7.7.md index 90f15afcb62..067f264d49d 100644 --- a/doc/update/7.6-to-7.7.md +++ b/doc/update/7.6-to-7.7.md @@ -99,6 +99,11 @@ 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. GitHub settings (if applicable) + +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.my-company-com/`) + ## Things went south? Revert to previous version (7.6) ### 1. Revert the code to the previous version |
