Commit 1ee94423230b26be023cb4ebcb8aed6472c25ed2
1 parent
7fe7897c
Exists in
spb-stable
and in
3 other branches
Further explain userPrincipalName settings
Showing
1 changed file
with
2 additions
and
1 deletions
Show diff stats
config/gitlab.yml.example
| @@ -134,7 +134,8 @@ production: &base | @@ -134,7 +134,8 @@ production: &base | ||
| 134 | # - the user enters 'jane.doe@example.com' and 'p@ssw0rd' as LDAP credentials; | 134 | # - the user enters 'jane.doe@example.com' and 'p@ssw0rd' as LDAP credentials; |
| 135 | # - GitLab queries the LDAP server with 'jane.doe' and 'p@ssw0rd'. | 135 | # - GitLab queries the LDAP server with 'jane.doe' and 'p@ssw0rd'. |
| 136 | # | 136 | # |
| 137 | - # Disable this setting if you are using "uid: 'userPrincipalName'" on ActiveDirectory. | 137 | + # If you are using "uid: 'userPrincipalName'" on ActiveDirectory you need to |
| 138 | + # disable this setting, because the userPrincipalName contains an '@'. | ||
| 138 | allow_username_or_email_login: true | 139 | allow_username_or_email_login: true |
| 139 | 140 | ||
| 140 | ## OmniAuth settings | 141 | ## OmniAuth settings |