diff options
author | Evan Read <eread@gitlab.com> | 2019-02-14 07:04:58 +0000 |
---|---|---|
committer | Evan Read <eread@gitlab.com> | 2019-02-14 07:04:58 +0000 |
commit | 1322146bbf5c76403db10969f1af6540717b1cdf (patch) | |
tree | e6ee74b80c33dd11ab9ae49e3d896a057c884dc3 /doc | |
parent | c6016ac8a8c12a736617e5250b63e0c930dda207 (diff) | |
parent | d219fbb95ffc1e15a9d03bd2fd85602db47f76ac (diff) | |
download | gitlab-ce-1322146bbf5c76403db10969f1af6540717b1cdf.tar.gz |
Merge branch 'patch-43' into 'master'
Fix callback url
See merge request gitlab-org/gitlab-ce!25195
Diffstat (limited to 'doc')
-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 eca9aa16499..9bb3579dd84 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 to your GitLab installation. e.g., `https://gitlab.company.com` - Application description: Fill this in if you wish. - - 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. + - 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. ![Register OAuth App](img/github_register_app.png) - NOTE: Be sure to append `/users/auth` to the end of the callback URL + NOTE: Be sure to append `/users/auth/github/callback` to the end of the callback URL to prevent a [OAuth2 convert redirect](http://tetraph.com/covert_redirect/) vulnerability. |