diff options
author | Rémy Coutable <remy@rymai.me> | 2016-04-28 12:37:13 +0300 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2016-04-28 12:37:13 +0300 |
commit | 7aff855bc7f0ac5a688df7dcafffbdc617882fc1 (patch) | |
tree | 362322c4267fee937522c5e3d5b427ff859730d0 /doc | |
parent | a792427eed95570da22844a06a09227730443189 (diff) | |
parent | c47183d78723a30733dc465f72e37299d8628363 (diff) |
Merge branch 'fix-github-enterprise-imports' into 'master'
Backport GitHub Enterprise import support from EE
These changes were pulled from GitLab EE to support configuring
an alternative API URL than the default https://api.github.com.
In addition, the `verify_ssl` flag allows users to disable SSL cert
checking.
One modification: add a default `args` option if it does not exist
to avoid breaking existing configurations.
See merge request !3892
Diffstat (limited to 'doc')
-rw-r--r-- | doc/integration/github.md | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/doc/integration/github.md b/doc/integration/github.md index 1890edd7a4c..e1f9242fd0e 100644 --- a/doc/integration/github.md +++ b/doc/integration/github.md @@ -60,12 +60,26 @@ GitHub will generate an application ID and secret key for you to use. For installation from source: + For GitHub.com: + + ``` + - { name: 'github', app_id: 'YOUR_APP_ID', + app_secret: 'YOUR_APP_SECRET', + args: { scope: 'user:email' } } + ``` + + + For GitHub Enterprise: + ``` - { name: 'github', app_id: 'YOUR_APP_ID', app_secret: 'YOUR_APP_SECRET', + url: "https://github.example.com/", args: { scope: 'user:email' } } ``` + __Replace `https://github.example.com/` with your GitHub URL.__ + 1. Change 'YOUR_APP_ID' to the client ID from the GitHub application page from step 7. 1. Change 'YOUR_APP_SECRET' to the client secret from the GitHub application page from step 7. |