Download as
Browse Code »

Commit a68630e06aee36c6304417f3ae8630cfca0ff107

Authored by Sytse Sijbrandij
2 parents 9cc9e9cd 1ee94423
Exists in spb-stable and in 3 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb

Merge branch 'user_principal_name' into 'master' 

Explain how to use userPrincipalName as the username with AD
Showing 1 changed file with 4 additions and 0 deletions   Show diff stats
config/gitlab.yml.example
  Diff comments   View file @a68630e
... ... @@ -129,9 +129,13 @@ 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 + # If you are using "uid: 'userPrincipalName'" on ActiveDirectory you need to
  138 + # disable this setting, because the userPrincipalName contains an '@'.
135 139 allow_username_or_email_login: true
136 140  
137 141 ## OmniAuth settings
... ...