diff options
author | Douwe Maan <douwe@gitlab.com> | 2017-07-06 12:59:21 +0000 |
---|---|---|
committer | Douwe Maan <douwe@gitlab.com> | 2017-07-06 12:59:21 +0000 |
commit | a33fb2132cc9c1924fe986ce562cd7bea084a5c9 (patch) | |
tree | 93fc06817bd2b068b96e1b5813966d8e4b75b234 /config/gitlab.yml.example | |
parent | d6836a3bc66662618efdd4f86969bdfd0904aca8 (diff) | |
parent | 89b0c987fcba5692842f83cfaba90a9004ac91de (diff) | |
download | gitlab-ce-a33fb2132cc9c1924fe986ce562cd7bea084a5c9.tar.gz |
Merge branch '18000-remember-me-for-oauth-login' into 'master'
Fix `migration:path` build for "Honor the 'Remember me' parameter for OAuth-based login"
Closes #34713
See merge request !12668
Diffstat (limited to 'config/gitlab.yml.example')
-rw-r--r-- | config/gitlab.yml.example | 43 |
1 files changed, 43 insertions, 0 deletions
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example index 4b81fd90f59..1eb209ac2be 100644 --- a/config/gitlab.yml.example +++ b/config/gitlab.yml.example @@ -619,6 +619,49 @@ 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: '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: |