Merge branch 'explain_allow_username_or_email_login' into 'master'

Explain allow_username_or_email_login LDAP setting

Merge branch 'explain_allow_username_or_email_login' into 'master'
Explain allow_username_or_email_login LDAP setting
Dmitriy Zaporozhets
2 parents f0d2d281 390f0b76
Showing 1 changed file with 5 additions and 0 deletions Show diff stats
config/gitlab.yml.example
@@ -127,6 +127,11 @@ production: &amp;base
     method: 'ssl' # "ssl" or "plain"
     bind_dn: '_the_full_dn_of_the_user_you_will_bind_with'
     password: '_the_password_of_the_bind_user'
+    # If allow_username_or_email_login is enabled, GitLab will ignore everything
+    # after the first '@' in LDAP the 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'.
     allow_username_or_email_login: true
  
   ## OmniAuth settings
...	...	@@ -127,6 +127,11 @@ production: &base
127	127	method: 'ssl' # "ssl" or "plain"
128	128	bind_dn: '_the_full_dn_of_the_user_you_will_bind_with'
129	129	password: '_the_password_of_the_bind_user'
	130	+ # If allow_username_or_email_login is enabled, GitLab will ignore everything
	131	+ # after the first '@' in LDAP the username submitted by the user on login.
	132	+ # Example:
	133	+ # - the user enters 'jane.doe@example.com' and 'p@ssw0rd' as LDAP credentials;
	134	+ # - GitLab queries the LDAP server with 'jane.doe' and 'p@ssw0rd'.
130	135	allow_username_or_email_login: true
131	136
132	137	## OmniAuth settings
...	...