Commit 7fe7897c authored by Jacob Vosmaer's avatar Jacob Vosmaer

Explain how to use AD userPrincipalName for logins

parent 416c2587
...@@ -129,9 +129,12 @@ production: &base ...@@ -129,9 +129,12 @@ production: &base
password: '_the_password_of_the_bind_user' password: '_the_password_of_the_bind_user'
# If allow_username_or_email_login is enabled, GitLab will ignore everything # 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. # after the first '@' in the LDAP username submitted by the user on login.
#
# Example: # Example:
# - the user enters 'jane.doe@example.com' and 'p@ssw0rd' as LDAP credentials; # - the user enters 'jane.doe@example.com' and 'p@ssw0rd' as LDAP credentials;
# - GitLab queries the LDAP server with 'jane.doe' and 'p@ssw0rd'. # - GitLab queries the LDAP server with 'jane.doe' and 'p@ssw0rd'.
#
# Disable this setting if you are using "uid: 'userPrincipalName'" on ActiveDirectory.
allow_username_or_email_login: true allow_username_or_email_login: true
## OmniAuth settings ## 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