diff options
| author | Jacob Vosmaer <contact@jacobvosmaer.nl> | 2014-01-21 13:33:29 +0100 |
|---|---|---|
| committer | Jacob Vosmaer <contact@jacobvosmaer.nl> | 2014-01-21 13:33:29 +0100 |
| commit | 1ee94423230b26be023cb4ebcb8aed6472c25ed2 (patch) | |
| tree | 3e7dd96b69feba2bbc772462ba94d8246d09129a /config | |
| parent | 7fe7897c56046ade852def480d2cebe1be584512 (diff) | |
| download | gitlab-ce-1ee94423230b26be023cb4ebcb8aed6472c25ed2.tar.gz | |
Further explain userPrincipalName settings
Diffstat (limited to 'config')
| -rw-r--r-- | config/gitlab.yml.example | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example index cdab54faaf8..3a46a0a521b 100644 --- a/config/gitlab.yml.example +++ b/config/gitlab.yml.example @@ -134,7 +134,8 @@ production: &base # - the user enters 'jane.doe@example.com' and 'p@ssw0rd' as LDAP credentials; # - GitLab queries the LDAP server with 'jane.doe' and 'p@ssw0rd'. # - # Disable this setting if you are using "uid: 'userPrincipalName'" on ActiveDirectory. + # 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 |