Commit 1ee94423 authored by Jacob Vosmaer's avatar Jacob Vosmaer

Further explain userPrincipalName settings

parent 7fe7897c
......@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment