diff options
| author | Douwe Maan <douwe@gitlab.com> | 2019-03-25 16:02:05 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2019-03-25 16:02:05 +0000 |
| commit | 13cd7cd76ff70c4ee63a3d6aea3f76c80a29b354 (patch) | |
| tree | 491fbb4babf237b2808daa691ef6754598fdc5ed /doc | |
| parent | 80a65cb85f489485ee5445ecd4327f0abbc5bf0b (diff) | |
| parent | 45da7dd306c76dc322ca6d2ceed92046219fd90f (diff) | |
| download | gitlab-ce-13cd7cd76ff70c4ee63a3d6aea3f76c80a29b354.tar.gz | |
Merge branch 'ce-1974-update-user-name-upon-ldap-sync' into 'master'
Backport 'Update user name upon LDAP sync' from EE
See merge request gitlab-org/gitlab-ce!26432
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/integration/omniauth.md | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/integration/omniauth.md b/doc/integration/omniauth.md index 69bbd05c367..2932c884d04 100644 --- a/doc/integration/omniauth.md +++ b/doc/integration/omniauth.md @@ -256,7 +256,7 @@ gitlab_rails['omniauth_enabled'] = false 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. +When authenticating using LDAP, the user's name and email are always synced. ```ruby gitlab_rails['sync_profile_from_provider'] = ['twitter', 'google_oauth2'] |