diff options
| author | Robert Speicher <robert@gitlab.com> | 2016-04-07 00:35:08 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2016-04-07 00:35:08 +0000 |
| commit | 936be025cde7fad6857410ef2cd842f2b1fc2a67 (patch) | |
| tree | e2dd3aa5623b8a6f112cecaab683e655e2967303 /config | |
| parent | 730625f022b1c3b9394cf944f04968a29ac8dc36 (diff) | |
| parent | 8110e7530902de8744ff985f08938306e2c38367 (diff) | |
| download | gitlab-ce-936be025cde7fad6857410ef2cd842f2b1fc2a67.tar.gz | |
Merge branch 'saml-external-groups' into 'master'
Allow SAML to identify external users and set them as such
Related to #4009
Fixes #14577
This allows SAML to retrieve group information form the `SAML Response`
and match that to a setting that will flag all matching users as external.
See merge request !3530
Diffstat (limited to 'config')
| -rw-r--r-- | config/gitlab.yml.example | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example index fb1c3476f65..ddee467b14b 100644 --- a/config/gitlab.yml.example +++ b/config/gitlab.yml.example @@ -345,6 +345,8 @@ production: &base # # - { name: 'saml', # label: 'Our SAML Provider', + # groups_attribute: 'Groups', + # external_groups: ['Contractors', 'Freelancers'], # 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', @@ -352,6 +354,7 @@ production: &base # issuer: 'https://gitlab.example.com', # name_identifier_format: 'urn:oasis:names:tc:SAML:2.0:nameid-format:transient' # } } + # # - { name: 'crowd', # args: { # crowd_server_url: 'CROWD SERVER URL', |