diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-05-29 10:37:27 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-05-29 10:37:27 +0000 |
| commit | 70b29c3576f646371c3a5bee312b921a3053fb70 (patch) | |
| tree | a0d7ccb7dbe8cec32de964d15e4ede1f14bea809 /config | |
| parent | aa97325deae515f45c047df3640d7b1f07247038 (diff) | |
| parent | 22de5443c5c37772e090268ed115b88d12427cc4 (diff) | |
| download | gitlab-ce-70b29c3576f646371c3a5bee312b921a3053fb70.tar.gz | |
Merge branch 'feature/saml_support' into 'master'
Add SAML support via Omniauth
Split of !669, with doc
See merge request !722
Diffstat (limited to 'config')
| -rw-r--r-- | config/gitlab.yml.example | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example index fbc7f515f34..5acfe548502 100644 --- a/config/gitlab.yml.example +++ b/config/gitlab.yml.example @@ -210,6 +210,15 @@ production: &base # args: { scope: 'api' } } # - { name: 'bitbucket', app_id: 'YOUR_APP_ID', # app_secret: 'YOUR_APP_SECRET'} + # - { name: 'saml', + # args: { + # assertion_consumer_service_url: 'https://gitlab.example.com/users/auth/saml/callback', + # idp_cert_fingerprint: '43:51:43:a1:b5:fc:8b:b7:0a:3a:a9:b1:0f:66:73:a8', + # idp_sso_target_url: 'https://login.example.com/idp', + # issuer: 'https://gitlab.example.com', + # name_identifier_format: 'urn:oasis:names:tc:SAML:2.0:nameid-format:transient' + # } } + |