summaryrefslogtreecommitdiff
path: root/doc/integration
diff options
context:
space:
mode:
authorJoshua Lambert <joshua@gitlab.com>2017-03-16 18:45:46 +0000
committerJoshua Lambert <joshua@gitlab.com>2017-03-16 18:45:46 +0000
commitd2f209a60b2ea2d889eaf5142c8d09ba0848a4c3 (patch)
tree62810ea2d1f8aa1d131e31ad667c39ea0a6d466a /doc/integration
parent83259875939958c6288066a3a4e59a5062b4c9e6 (diff)
parentce5d1b6fd7ed1aea2d2a675414ba81be624f2bf1 (diff)
downloadgitlab-ce-29142-add-prometheus-integration-documentation.tar.gz
Merge branch 'master' into '29142-add-prometheus-integration-documentation'29142-add-prometheus-integration-documentation
# Conflicts: # doc/install/requirements.md
Diffstat (limited to 'doc/integration')
-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).