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
path: root/config
diff options
context:
space:
mode:
authorSean McGivern <sean@mcgivern.me.uk>2017-07-05 19:01:40 +0300
committerSean McGivern <sean@mcgivern.me.uk>2017-07-05 19:01:40 +0300
commit8a3022a69826272fb5eb111c016770965a5484b3 (patch)
tree8e5afc578cafc1727125864be47dd393bd17fe4c /config
parentd9a5d9214002a2895aaf0c598bef985b2b4ddc57 (diff)
Revert "Merge branch '18000-remember-me-for-oauth-login' into 'master'"
This reverts merge request !11963
Diffstat (limited to 'config')
-rw-r--r--config/gitlab.yml.example47
1 files changed, 0 insertions, 47 deletions
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example
index fdc2b24e110..4b81fd90f59 100644
--- a/config/gitlab.yml.example
+++ b/config/gitlab.yml.example
@@ -619,53 +619,6 @@ test:
title: "JIRA"
url: https://sample_company.atlassian.net
project_key: PROJECT
-
- omniauth:
- enabled: true
- allow_single_sign_on: true
- external_providers: []
-
- providers:
- - { name: 'cas3',
- label: 'cas3',
- args: { url: 'https://sso.example.com',
- disable_ssl_verification: false,
- login_url: '/cas/login',
- service_validate_url: '/cas/p3/serviceValidate',
- logout_url: '/cas/logout'} }
- - { name: 'authentiq',
- app_id: 'YOUR_CLIENT_ID',
- app_secret: 'YOUR_CLIENT_SECRET',
- args: { scope: 'aq:name email~rs address aq:push' } }
- - { name: 'github',
- app_id: 'YOUR_APP_ID',
- app_secret: 'YOUR_APP_SECRET',
- url: "https://github.com/",
- verify_ssl: false,
- args: { scope: 'user:email' } }
- - { name: 'bitbucket',
- app_id: 'YOUR_APP_ID',
- app_secret: 'YOUR_APP_SECRET' }
- - { name: 'gitlab',
- app_id: 'YOUR_APP_ID',
- app_secret: 'YOUR_APP_SECRET',
- args: { scope: 'api' } }
- - { name: 'google_oauth2',
- app_id: 'YOUR_APP_ID',
- app_secret: 'YOUR_APP_SECRET',
- args: { access_type: 'offline', approval_prompt: '' } }
- - { name: 'facebook',
- app_id: 'YOUR_APP_ID',
- app_secret: 'YOUR_APP_SECRET' }
- - { name: 'twitter',
- app_id: 'YOUR_APP_ID',
- app_secret: 'YOUR_APP_SECRET' }
- - { name: 'auth0',
- args: {
- client_id: 'YOUR_AUTH0_CLIENT_ID',
- client_secret: 'YOUR_AUTH0_CLIENT_SECRET',
- namespace: 'YOUR_AUTH0_DOMAIN' } }
-
ldap:
enabled: false
servers: