Commit 7fe7897c56046ade852def480d2cebe1be584512
1 parent
416c2587
Exists in
spb-stable
and in
3 other branches
Explain how to use AD userPrincipalName for logins
Showing
1 changed file
with
3 additions
and
0 deletions
Show diff stats
config/gitlab.yml.example
| @@ -129,9 +129,12 @@ production: &base | @@ -129,9 +129,12 @@ production: &base | ||
| 129 | password: '_the_password_of_the_bind_user' | 129 | password: '_the_password_of_the_bind_user' |
| 130 | # If allow_username_or_email_login is enabled, GitLab will ignore everything | 130 | # If allow_username_or_email_login is enabled, GitLab will ignore everything |
| 131 | # after the first '@' in the LDAP username submitted by the user on login. | 131 | # after the first '@' in the LDAP username submitted by the user on login. |
| 132 | + # | ||
| 132 | # Example: | 133 | # Example: |
| 133 | # - the user enters 'jane.doe@example.com' and 'p@ssw0rd' as LDAP credentials; | 134 | # - 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'. | 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 | allow_username_or_email_login: true | 138 | allow_username_or_email_login: true |
| 136 | 139 | ||
| 137 | ## OmniAuth settings | 140 | ## OmniAuth settings |