Further explain userPrincipalName settings

Jacob Vosmaer
1 parent 7fe7897c
Showing 1 changed file with 2 additions and 1 deletions Show diff stats
config/gitlab.yml.example
@@ -134,7 +134,8 @@ production: &amp;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
...	...	@@ -134,7 +134,8 @@ production: &base
134	134	# - the user enters 'jane.doe@example.com' and 'p@ssw0rd' as LDAP credentials;
135	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	139	allow_username_or_email_login: true
139	140
140	141	## OmniAuth settings
...	...