diff --git a/doc/integration/github.md b/doc/integration/github.md index 714593d8266d234c7d7e87ce06da10a3a75960ba..a586334b98d3c100958480b924cdc7c3e0d2ee5d 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 index c0873b2e20d142779e3e2642a176bc2bdcd4899d..d890345ced917f2c78ae77dc39c2b66d1362e0d5 100644 Binary files a/doc/integration/github_app.png and b/doc/integration/github_app.png differ diff --git a/doc/update/7.6-to-7.7.md b/doc/update/7.6-to-7.7.md index 90f15afcb625d19738801ea454623999b58ee9e9..067f264d49d21b3d08300df727b3852002ead994 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