diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-08 09:09:54 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-08 09:09:54 +0300 |
commit | f6cdec670b9b757fc2225a2c6627ab79765e5b8a (patch) | |
tree | 7a1fde030f117b69332d01b22deefd1c81fff458 /doc/administration/auth | |
parent | e2ee1eec50aa8df8543d7ecc585ec0ba5ee544ac (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/administration/auth')
-rw-r--r-- | doc/administration/auth/ldap-ee.md | 2 | ||||
-rw-r--r-- | doc/administration/auth/ldap-troubleshooting.md | 2 | ||||
-rw-r--r-- | doc/administration/auth/ldap.md | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/doc/administration/auth/ldap-ee.md b/doc/administration/auth/ldap-ee.md index a87118a800a..3bc30c4c01c 100644 --- a/doc/administration/auth/ldap-ee.md +++ b/doc/administration/auth/ldap-ee.md @@ -4,7 +4,7 @@ type: reference # LDAP Additions in GitLab EE **(STARTER ONLY)** -This section documents LDAP features specific to to GitLab Enterprise Edition +This section documents LDAP features specific to GitLab Enterprise Edition [Starter](https://about.gitlab.com/pricing/#self-managed) and above. For documentation relevant to both Community Edition and Enterprise Edition, diff --git a/doc/administration/auth/ldap-troubleshooting.md b/doc/administration/auth/ldap-troubleshooting.md index b852140e80a..612f782e841 100644 --- a/doc/administration/auth/ldap-troubleshooting.md +++ b/doc/administration/auth/ldap-troubleshooting.md @@ -227,7 +227,7 @@ uid: John There's a lot here, so let's go over what could be helpful when debugging. -First, GitLab will look for all users that have have previously +First, GitLab will look for all users that have previously logged in with LDAP and iterate on them. Each user's sync will start with the following line that contains the user's username and email, as they exist in GitLab now: diff --git a/doc/administration/auth/ldap.md b/doc/administration/auth/ldap.md index 12a42ec0a1e..1e91b539db5 100644 --- a/doc/administration/auth/ldap.md +++ b/doc/administration/auth/ldap.md @@ -498,7 +498,7 @@ the configuration option `lowercase_usernames`. By default, this configuration o ## Disable LDAP web sign in -It can be be useful to prevent using LDAP credentials through the web UI when +It can be useful to prevent using LDAP credentials through the web UI when an alternative such as SAML is preferred. This allows LDAP to be used for group sync, while also allowing your SAML identity provider to handle additional checks like custom 2FA. |