diff options
| author | Sytse Sijbrandij <sytse@gitlab.com> | 2014-01-21 13:56:09 +0000 |
|---|---|---|
| committer | Sytse Sijbrandij <sytse@gitlab.com> | 2014-01-21 13:56:09 +0000 |
| commit | a68630e06aee36c6304417f3ae8630cfca0ff107 (patch) | |
| tree | 5444dc9a554e3ba4385a44a588821cc8a5ac6931 | |
| parent | 9cc9e9cd9a5914b3aa7abf91325839ccd485fa0d (diff) | |
| parent | 1ee94423230b26be023cb4ebcb8aed6472c25ed2 (diff) | |
| download | gitlab-ce-a68630e06aee36c6304417f3ae8630cfca0ff107.tar.gz | |
Merge branch 'user_principal_name' into 'master'
Explain how to use userPrincipalName as the username with AD
| -rw-r--r-- | config/gitlab.yml.example | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example index f628ac9121f..3a46a0a521b 100644 --- a/config/gitlab.yml.example +++ b/config/gitlab.yml.example @@ -129,9 +129,13 @@ production: &base password: '_the_password_of_the_bind_user' # If allow_username_or_email_login is enabled, GitLab will ignore everything # after the first '@' in the LDAP username submitted by the user on login. + # # Example: # - the user enters 'jane.doe@example.com' and 'p@ssw0rd' as LDAP credentials; # - GitLab queries the LDAP server with 'jane.doe' and 'p@ssw0rd'. + # + # If you are using "uid: 'userPrincipalName'" on ActiveDirectory you need to + # disable this setting, because the userPrincipalName contains an '@'. allow_username_or_email_login: true ## OmniAuth settings |