summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAchilleas Pipinellis <axilleas@axilleas.me>2017-03-14 09:09:56 +0000
committerAchilleas Pipinellis <axilleas@axilleas.me>2017-03-14 09:09:56 +0000
commit5e05d6b8cf26c424378ef6091a4b38c2d424808e (patch)
treec4e06845de9851d8473918674619243daef7f28b
parent1957dde410fbb68fe6abda72cc9d036816c6a634 (diff)
parent4cbe05e8029c32e68719b4b8445c6ab5677c519d (diff)
downloadgitlab-ce-5e05d6b8cf26c424378ef6091a4b38c2d424808e.tar.gz
Merge branch 'patch-15' into 'master'
Patch 15 Closes #29361 See merge request !9922
-rw-r--r--doc/integration/github.md2
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/integration/github.md b/doc/integration/github.md
index cea85f073cc..4b0d33334bd 100644
--- a/doc/integration/github.md
+++ b/doc/integration/github.md
@@ -19,7 +19,7 @@ GitHub will generate an application ID and secret key for you to use.
- 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 is 'http(s)://${YOUR_DOMAIN}'
+ - Authorization callback URL is 'http(s)://${YOUR_DOMAIN}'. Please make sure the port is included if your Gitlab instance is not configured on default port.
1. Select "Register application".
1. You should now see a Client ID and Client Secret near the top right of the page (see screenshot).