summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWei-Meng Lee <1081658-weimeng@users.noreply.gitlab.com>2019-06-06 00:24:56 +0000
committerWei-Meng Lee <1081658-weimeng@users.noreply.gitlab.com>2019-06-06 00:24:56 +0000
commit8835bdad1d2d881340c7e56f8b57844122242853 (patch)
tree2b99142794a4055c8447665bea92d92c13b5d9cf
parente6a88b024fa7f8e1ec5b712744d0e0d118b026e6 (diff)
downloadgitlab-ce-revert-1322146b.tar.gz
Revert "Merge branch 'patch-43' into 'master'"revert-1322146b
This reverts merge request !25195
-rw-r--r--doc/integration/github.md4
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.