diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-21 06:08:58 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-21 06:08:58 +0000 |
| commit | 18b8435318887d3fc6e9f9d305967a953cdd7d3f (patch) | |
| tree | 28cb71f255eb364c224ff24dd085f8cd836951b1 /doc/administration/auth | |
| parent | 4359b9650ecf0960f04f0fd38fc25bec7b478a11 (diff) | |
| download | gitlab-ce-18b8435318887d3fc6e9f9d305967a953cdd7d3f.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/administration/auth')
| -rw-r--r-- | doc/administration/auth/authentiq.md | 5 | ||||
| -rw-r--r-- | doc/administration/auth/ldap-ee.md | 2 | ||||
| -rw-r--r-- | doc/administration/auth/ldap.md | 3 |
3 files changed, 7 insertions, 3 deletions
diff --git a/doc/administration/auth/authentiq.md b/doc/administration/auth/authentiq.md index d15beb4f6fc..e9b32b64160 100644 --- a/doc/administration/auth/authentiq.md +++ b/doc/administration/auth/authentiq.md @@ -66,7 +66,10 @@ Authentiq will generate a Client ID and the accompanying Client Secret for you t On the sign in page there should now be an Authentiq icon below the regular sign in form. Click the icon to begin the authentication process. -- If the user has the Authentiq ID app installed in their iOS or Android device, they can scan the QR code, decide what personal details to share and sign in to your GitLab installation. +- If the user has the Authentiq ID app installed in their iOS or Android device, they can: + 1. Scan the QR code. + 1. Decide what personal details to share. + 1. Sign in to your GitLab installation. - If not they will be prompted to download the app and then follow the procedure above. If everything goes right, the user will be returned to GitLab and will be signed in. diff --git a/doc/administration/auth/ldap-ee.md b/doc/administration/auth/ldap-ee.md index 5217cd5114a..cbe24ca9e22 100644 --- a/doc/administration/auth/ldap-ee.md +++ b/doc/administration/auth/ldap-ee.md @@ -392,7 +392,7 @@ Group sync was written to be as performant as possible. Data is cached, database queries are optimized, and LDAP queries are minimized. The last benchmark run revealed the following metrics: -For 20,000 LDAP users, 11,000 LDAP groups and 1,000 GitLab groups with 10 +For 20000 LDAP users, 11000 LDAP groups and 1000 GitLab groups with 10 LDAP group links each: - Initial sync (no existing members assigned in GitLab) took 1.8 hours diff --git a/doc/administration/auth/ldap.md b/doc/administration/auth/ldap.md index 339710624fa..db7c11ada10 100644 --- a/doc/administration/auth/ldap.md +++ b/doc/administration/auth/ldap.md @@ -461,7 +461,8 @@ LDAP email address, and then sign into GitLab via their LDAP credentials. ## Enabling LDAP username lowercase -Some LDAP servers, depending on their configurations, can return uppercase usernames. This can lead to several confusing issues like, for example, creating links or namespaces with uppercase names. +Some LDAP servers, depending on their configurations, can return uppercase usernames. +This can lead to several confusing issues such as creating links or namespaces with uppercase names. GitLab can automatically lowercase usernames provided by the LDAP server by enabling the configuration option `lowercase_usernames`. By default, this configuration option is `false`. |