diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-06 06:08:08 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-06 06:08:08 +0300 |
commit | a6011c3d70e0e8ac318ba6629183c44f8614c4df (patch) | |
tree | a3d21394d63c47448998c89f01eb88e57c0ed8ce /doc/administration/auth | |
parent | ffc757a7a92535559c20eb706593f7358d9bf589 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/administration/auth')
-rw-r--r-- | doc/administration/auth/crowd.md | 2 | ||||
-rw-r--r-- | doc/administration/auth/ldap.md | 12 | ||||
-rw-r--r-- | doc/administration/auth/okta.md | 6 |
3 files changed, 10 insertions, 10 deletions
diff --git a/doc/administration/auth/crowd.md b/doc/administration/auth/crowd.md index da6c01ec382..6c2e4edac31 100644 --- a/doc/administration/auth/crowd.md +++ b/doc/administration/auth/crowd.md @@ -54,7 +54,7 @@ Authenticate to GitLab using the Atlassian Crowd OmniAuth provider. **Source:** - ``` + ```yaml - { name: 'crowd', args: { crowd_server_url: 'CROWD_SERVER_URL', diff --git a/doc/administration/auth/ldap.md b/doc/administration/auth/ldap.md index db7c11ada10..067fdfd0018 100644 --- a/doc/administration/auth/ldap.md +++ b/doc/administration/auth/ldap.md @@ -405,7 +405,7 @@ production: Tip: If you want to limit access to the nested members of an Active Directory group, you can use the following syntax: -```text +```plaintext (memberOf:1.2.840.113556.1.4.1941:=CN=My Group,DC=Example,DC=com) ``` @@ -423,13 +423,13 @@ The `user_filter` DN can contain special characters. For example: - A comma: - ```text + ```plaintext OU=GitLab, Inc,DC=gitlab,DC=com ``` - Open and close brackets: - ```text + ```plaintext OU=Gitlab (Inc),DC=gitlab,DC=com ``` @@ -438,13 +438,13 @@ The `user_filter` DN can contain special characters. For example: - Escape commas with `\2C`. For example: - ```text + ```plaintext OU=GitLab\2C Inc,DC=gitlab,DC=com ``` - Escape open and close brackets with `\28` and `\29`, respectively. For example: - ```text + ```plaintext OU=Gitlab \28Inc\29,DC=gitlab,DC=com ``` @@ -603,7 +603,7 @@ GitLab. Common combinations are `encryption: 'plain'` and `port: 389`, OR If GitLab cannot reach your LDAP endpoint, you will see a message like this: -``` +```plaintext Could not authenticate you from Ldapmain because "Connection timed out - user specified timeout". ``` diff --git a/doc/administration/auth/okta.md b/doc/administration/auth/okta.md index c83645ffe74..4fd37b51f24 100644 --- a/doc/administration/auth/okta.md +++ b/doc/administration/auth/okta.md @@ -86,9 +86,9 @@ Now that the Okta app is configured, it's time to enable it in GitLab. Edit `config/gitlab.yml`: - ```yaml - auto_link_saml_user: true - ``` + ```yaml + auto_link_saml_user: true + ``` 1. Add the provider configuration. |