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 /config/gitlab.yml.example
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 'config/gitlab.yml.example')
-rw-r--r--config/gitlab.yml.example2
1 files changed, 2 insertions, 0 deletions
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example
index d9c15f81404..2790f1c8a29 100644
--- a/config/gitlab.yml.example
+++ b/config/gitlab.yml.example
@@ -350,6 +350,8 @@ production: &base
# - { name: 'github',
# app_id: 'YOUR_APP_ID',
# app_secret: 'YOUR_APP_SECRET',
+ # url: "https://github.com/",
+ # verify_ssl: true,
# args: { scope: 'user:email' } }
# - { name: 'bitbucket',
# app_id: 'YOUR_APP_ID',