Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2016-04-22 22:43:10 +0300
committerStan Hu <stanhu@gmail.com>2016-04-27 07:00:55 +0300
commiteede0323453190440a8d738b5eab0723f54dee65 (patch)
treefd54471c6ed4bf76a0c02404dc3f0918bb3ccdb6 /doc/integration/github.md
parentc01ff1f54b55a60f7c7473d0d8a429d5cf9c1609 (diff)
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.
Diffstat (limited to 'doc/integration/github.md')
-rw-r--r--doc/integration/github.md14
1 files changed, 14 insertions, 0 deletions
diff --git a/doc/integration/github.md b/doc/integration/github.md
index 1890edd7a4c..ac17e2069f0 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.