Explain how to use AD userPrincipalName for logins

Jacob Vosmaer
1 parent 416c2587
Showing 1 changed file with 3 additions and 0 deletions Show diff stats
config/gitlab.yml.example
@@ -129,9 +129,12 @@ production: &amp;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'.
+    #
+    # Disable this setting if you are using "uid: 'userPrincipalName'" on ActiveDirectory.
     allow_username_or_email_login: true
  
   ## OmniAuth settings
...	...	@@ -129,9 +129,12 @@ production: &base
129	129	password: '_the_password_of_the_bind_user'
130	130	# If allow_username_or_email_login is enabled, GitLab will ignore everything
131	131	# after the first '@' in the LDAP username submitted by the user on login.
	132	+ #
132	133	# Example:
133	134	# - the user enters 'jane.doe@example.com' and 'p@ssw0rd' as LDAP credentials;
134	135	# - GitLab queries the LDAP server with 'jane.doe' and 'p@ssw0rd'.
	136	+ #
	137	+ # Disable this setting if you are using "uid: 'userPrincipalName'" on ActiveDirectory.
135	138	allow_username_or_email_login: true
136	139
137	140	## OmniAuth settings
...	...