diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2017-12-15 15:46:22 +0300 |
|---|---|---|
| committer | Oswaldo Ferreira <oswaldo@gitlab.com> | 2017-12-19 19:04:43 +0300 |
| commit | 5a3a41e9e52c0fc96a95484bfb60c38a02fc702e (patch) | |
| tree | 79cf2ded70cea845699ed76096f643afb094598a /config | |
| parent | ac8c0ba1965c2b078f7501b929c5258be6fab81b (diff) | |
Merge branch 'dm-ldap-email-readonly' into 'master'
Make sure user email is read only when synced with LDAP
Closes #41033
See merge request gitlab-org/gitlab-ce!15915
(cherry picked from commit d39d968ba4100be3e77e9d02af6ce10ff18ca508)
481b8a71 Make sure user email is read only when synced with LDAP
Diffstat (limited to 'config')
| -rw-r--r-- | config/gitlab.yml.example | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example index c8b6018bc1b..f2f05b3eeb2 100644 --- a/config/gitlab.yml.example +++ b/config/gitlab.yml.example @@ -383,6 +383,7 @@ production: &base # Sync user's profile from the specified Omniauth providers every time the user logs in (default: empty). # Define the allowed providers using an array, e.g. ["cas3", "saml", "twitter"], # or as true/false to allow all providers or none. + # When authenticating using LDAP, the user's email is always synced. # sync_profile_from_provider: [] # Select which info to sync from the providers above. (default: email). |