summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorSean McGivern <sean@mcgivern.me.uk>2017-12-15 12:46:22 +0000
committerSean McGivern <sean@mcgivern.me.uk>2017-12-15 12:46:22 +0000
commitd39d968ba4100be3e77e9d02af6ce10ff18ca508 (patch)
tree9d4d9f4b756d4607cbd93b5bf4f74c0cdce06be7 /doc
parent3a19e532f51b4b52ec3e292921106f43f8db948e (diff)
parent481b8a71f8ee63758d26a57a6367c091d4b76b09 (diff)
downloadgitlab-ce-d39d968ba4100be3e77e9d02af6ce10ff18ca508.tar.gz
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
Diffstat (limited to 'doc')
-rw-r--r--doc/integration/omniauth.md12
1 files changed, 7 insertions, 5 deletions
diff --git a/doc/integration/omniauth.md b/doc/integration/omniauth.md
index 0e20b8096e9..20087a981f9 100644
--- a/doc/integration/omniauth.md
+++ b/doc/integration/omniauth.md
@@ -229,16 +229,18 @@ In order to enable/disable an OmniAuth provider, go to Admin Area -> Settings ->
## Keep OmniAuth user profiles up to date
You can enable profile syncing from selected OmniAuth providers and for all or for specific user information.
-
+
+When authenticating using LDAP, the user's email is always synced.
+
```ruby
gitlab_rails['sync_profile_from_provider'] = ['twitter', 'google_oauth2']
gitlab_rails['sync_profile_attributes'] = ['name', 'email', 'location']
```
-
+
**For installations from source**
-
+
```yaml
omniauth:
sync_profile_from_provider: ['twitter', 'google_oauth2']
- sync_profile_claims_from_provider: ['email', 'location']
- ``` \ No newline at end of file
+ sync_profile_attributes: ['email', 'location']
+ ```