summaryrefslogtreecommitdiff
path: root/doc/integration
diff options
context:
space:
mode:
authorValery Sizov <valery@gitlab.com>2015-01-19 12:19:21 -0800
committerValery Sizov <valery@gitlab.com>2015-01-19 12:55:44 -0800
commitd5ae521cf798a4c553fcf836b51a28b65cd46da7 (patch)
treeb871faa0358118ec12375978f89eba0b85f492a5 /doc/integration
parent465f41673a418096b761d12438301c7b217f9a81 (diff)
downloadgitlab-ce-d5ae521cf798a4c553fcf836b51a28b65cd46da7.tar.gz
update documentation regarding github_importer
Diffstat (limited to 'doc/integration')
-rw-r--r--doc/integration/github.md2
-rw-r--r--doc/integration/github_app.pngbin75607 -> 75297 bytes
2 files changed, 1 insertions, 1 deletions
diff --git a/doc/integration/github.md b/doc/integration/github.md
index 714593d8266..a586334b98d 100644
--- a/doc/integration/github.md
+++ b/doc/integration/github.md
@@ -14,7 +14,7 @@ To enable the GitHub OmniAuth provider you must register your application with G
- 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: 'https://gitlab.company.com/users/auth/github/callback'
+ - Authorization callback URL: 'https://gitlab.company.com/'
1. Select "Register application".
1. You should now see a Client ID and Client Secret near the top right of the page (see screenshot). Keep this page open as you continue configuration. ![GitHub app](github_app.png)
diff --git a/doc/integration/github_app.png b/doc/integration/github_app.png
index c0873b2e20d..d890345ced9 100644
--- a/doc/integration/github_app.png
+++ b/doc/integration/github_app.png
Binary files differ