diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2017-07-05 12:41:06 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-07-05 12:41:06 +0000 |
| commit | 6df61942e9b42fe6a733606b89f3f16f3b20f1e2 (patch) | |
| tree | 3c5fa8fcda092a97c842f2dc5ba922b7cf64477a /config | |
| parent | 3f0e37f6d41ebca5dd63b955e1375df17a23b190 (diff) | |
| parent | 2ae8158c8c1ac6add71b4f3ef8738c5919bdca4e (diff) | |
| download | gitlab-ce-6df61942e9b42fe6a733606b89f3f16f3b20f1e2.tar.gz | |
Merge branch '18000-remember-me-for-oauth-login' into 'master'
Honor the "Remember me" parameter for OAuth-based login
Closes #18000
See merge request !11963
Diffstat (limited to 'config')
| -rw-r--r-- | config/gitlab.yml.example | 47 |
1 files changed, 47 insertions, 0 deletions
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example index 4b81fd90f59..fdc2b24e110 100644 --- a/config/gitlab.yml.example +++ b/config/gitlab.yml.example @@ -619,6 +619,53 @@ 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: |