diff options
author | Evan Read <eread@gitlab.com> | 2019-06-06 02:43:36 +0000 |
---|---|---|
committer | Evan Read <eread@gitlab.com> | 2019-06-06 02:43:36 +0000 |
commit | dd0d9b27fd3653d236320c34cbdc1f9def5c972d (patch) | |
tree | 59b2c3c75b433e8e06387da44546da91c326fca6 | |
parent | da334914916d63c54bd0746ca23b165ce4ba3308 (diff) | |
parent | 8835bdad1d2d881340c7e56f8b57844122242853 (diff) | |
download | gitlab-ce-dd0d9b27fd3653d236320c34cbdc1f9def5c972d.tar.gz |
Merge branch 'revert-1322146b' into 'master'
Revert "Fix callback url"
See merge request gitlab-org/gitlab-ce!29234
-rw-r--r-- | doc/integration/github.md | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/integration/github.md b/doc/integration/github.md index e145afbdd5e..5b01dd9feb7 100644 --- a/doc/integration/github.md +++ b/doc/integration/github.md @@ -21,10 +21,10 @@ To get the credentials (a pair of Client ID and Client Secret), you must registe - 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 of your GitLab installation. For example, `https://gitlab.example.com`. - Application description: Fill this in if you wish. - - Authorization callback URL: `http(s)://${YOUR_DOMAIN}/users/auth/github/callback`. Please make sure the port is included if your GitLab instance is not configured on default port. + - Authorization callback URL: `http(s)://${YOUR_DOMAIN}/users/auth`. Please make sure the port is included if your GitLab instance is not configured on default port. ![Register OAuth App](img/github_register_app.png) - NOTE: Be sure to append `/users/auth/github/callback` to the end of the callback URL + NOTE: Be sure to append `/users/auth` to the end of the callback URL to prevent a [OAuth2 convert redirect](http://tetraph.com/covert_redirect/) vulnerability. |