summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEvan Read <eread@gitlab.com>2019-01-08 00:13:28 +0000
committerEvan Read <eread@gitlab.com>2019-01-08 00:13:28 +0000
commit1924a13ee27a442124009b8aae8a46c606a94acd (patch)
tree443ee0a1b95cef748b0f2f25e6f9de5a866de850
parent69ef54ea332d4443709a22186f528792eef3f800 (diff)
parent9b8bcd7d95bd81a7a09e1b610a0d9ce0b1962a93 (diff)
downloadgitlab-ce-1924a13ee27a442124009b8aae8a46c606a94acd.tar.gz
Merge branch 'patch-37' into 'master'
Link highlighting of jon.doe@example.com swallowed the trailing backtick, destroying formatting. See merge request gitlab-org/gitlab-ce!24133
-rw-r--r--doc/administration/auth/how_to_configure_ldap_gitlab_ce/index.md2
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/administration/auth/how_to_configure_ldap_gitlab_ce/index.md b/doc/administration/auth/how_to_configure_ldap_gitlab_ce/index.md
index 621d4f77d5e..0d03b481881 100644
--- a/doc/administration/auth/how_to_configure_ldap_gitlab_ce/index.md
+++ b/doc/administration/auth/how_to_configure_ldap_gitlab_ce/index.md
@@ -255,7 +255,7 @@ After configuring LDAP, basic authentication will be available. Users can then l
Users that are removed from the LDAP base group (e.g `OU=GitLab INT,DC=GitLab,DC=org`) will be **blocked** in GitLab. [More information](../ldap.md#security) on LDAP security.
-If `allow_username_or_email_login` is enabled in the LDAP configuration, GitLab will ignore everything after the first '@' in the LDAP username used on login. Example: The username `jon.doe@example.com` is converted to `jon.doe` when authenticating with the LDAP server. Disable this setting if you use `userPrincipalName` as the `uid`.
+If `allow_username_or_email_login` is enabled in the LDAP configuration, GitLab will ignore everything after the first '@' in the LDAP username used on login. Example: The username `` jon.doe@example.com `` is converted to `jon.doe` when authenticating with the LDAP server. Disable this setting if you use `userPrincipalName` as the `uid`.
## LDAP extended features on GitLab EE