summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorDouwe Maan <douwe@selenight.nl>2017-12-13 18:02:49 +0100
committerDouwe Maan <douwe@selenight.nl>2017-12-15 12:48:48 +0100
commit481b8a71f8ee63758d26a57a6367c091d4b76b09 (patch)
tree1dad8e2612bdce00ca3b537db648bcd54785a95a /doc
parentd673628de003d1ce1402f03311066339828fb811 (diff)
downloadgitlab-ce-481b8a71f8ee63758d26a57a6367c091d4b76b09.tar.gz
Make sure user email is read only when synced with LDAP
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']
+ ```