diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-08-17 15:09:15 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-08-17 15:09:15 +0300 |
commit | cd92e0ff989f38f028fd3ee8d27e0fb1d21f7362 (patch) | |
tree | b27854c43f5f5c4a0e71fc6c756b83c55ae543b4 /doc/administration/auth | |
parent | d0ed973bd7c3a5c79c2bf9673d9d7260f91dd961 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/administration/auth')
-rw-r--r-- | doc/administration/auth/atlassian.md | 2 | ||||
-rw-r--r-- | doc/administration/auth/crowd.md | 2 | ||||
-rw-r--r-- | doc/administration/auth/jwt.md | 2 | ||||
-rw-r--r-- | doc/administration/auth/ldap/google_secure_ldap.md | 2 | ||||
-rw-r--r-- | doc/administration/auth/oidc.md | 10 | ||||
-rw-r--r-- | doc/administration/auth/smartcard.md | 8 |
6 files changed, 13 insertions, 13 deletions
diff --git a/doc/administration/auth/atlassian.md b/doc/administration/auth/atlassian.md index bc0db969cd3..cbfb4921e14 100644 --- a/doc/administration/auth/atlassian.md +++ b/doc/administration/auth/atlassian.md @@ -77,7 +77,7 @@ To enable the Atlassian OmniAuth provider for passwordless authentication you mu 1. For the changes to take effect: - If you installed using the Linux package, [reconfigure GitLab](../restart_gitlab.md#reconfigure-a-linux-package-installation). - - If you self-compiled your installation, [restart GitLab](../restart_gitlab.md#installations-from-source). + - If you self-compiled your installation, [restart GitLab](../restart_gitlab.md#self-compiled-installations). On the sign-in page there should now be an Atlassian icon below the regular sign in form. Select the icon to begin the authentication process. diff --git a/doc/administration/auth/crowd.md b/doc/administration/auth/crowd.md index 317f8fc1be7..6ced9f844cd 100644 --- a/doc/administration/auth/crowd.md +++ b/doc/administration/auth/crowd.md @@ -78,7 +78,7 @@ this provider also allows Crowd authentication for Git-over-https requests. 1. Change `YOUR_APP_PASSWORD` to the application password you've set. 1. Save the configuration file. 1. [Reconfigure](../restart_gitlab.md#reconfigure-a-linux-package-installation) (Linux package installations) or - [restart](../restart_gitlab.md#installations-from-source) (self-compiled installations) for the changes to take effect. + [restart](../restart_gitlab.md#self-compiled-installations) (self-compiled installations) for the changes to take effect. On the sign in page there should now be a Crowd tab in the sign in form. diff --git a/doc/administration/auth/jwt.md b/doc/administration/auth/jwt.md index 6e05fb0458f..9f95682fc47 100644 --- a/doc/administration/auth/jwt.md +++ b/doc/administration/auth/jwt.md @@ -77,7 +77,7 @@ JWT provides you with a secret key for you to use. 1. Save the configuration file. 1. For changes to take effect, if you: - Used the Linux package to install GitLab, [reconfigure GitLab](../restart_gitlab.md#reconfigure-a-linux-package-installation). - - Self-compiled your GitLab installation, [restart GitLab](../restart_gitlab.md#installations-from-source). + - Self-compiled your GitLab installation, [restart GitLab](../restart_gitlab.md#self-compiled-installations). On the sign in page there should now be a JWT icon below the regular sign in form. Select the icon to begin the authentication process. JWT asks the user to diff --git a/doc/administration/auth/ldap/google_secure_ldap.md b/doc/administration/auth/ldap/google_secure_ldap.md index d484059c79f..388288bbe49 100644 --- a/doc/administration/auth/ldap/google_secure_ldap.md +++ b/doc/administration/auth/ldap/google_secure_ldap.md @@ -210,7 +210,7 @@ For self-compiled installations: -----END PRIVATE KEY----- ``` -1. Save the file and [restart](../../restart_gitlab.md#installations-from-source) GitLab for the changes to take effect. +1. Save the file and [restart](../../restart_gitlab.md#self-compiled-installations) GitLab for the changes to take effect. ## Using encrypted credentials diff --git a/doc/administration/auth/oidc.md b/doc/administration/auth/oidc.md index 3d748da536d..8ef95872ad4 100644 --- a/doc/administration/auth/oidc.md +++ b/doc/administration/auth/oidc.md @@ -187,7 +187,7 @@ The OpenID Connect provides you with a client's details and secret for you to us 1. For changes to take effect, if you: - Used the Linux package to install GitLab, [reconfigure GitLab](../restart_gitlab.md#reconfigure-a-linux-package-installation). - - Self-compiled your GitLab installation, [restart GitLab](../restart_gitlab.md#installations-from-source). + - Self-compiled your GitLab installation, [restart GitLab](../restart_gitlab.md#self-compiled-installations). On the sign in page, you have an OpenID Connect option below the regular sign in form. Select this option to begin the authentication process. The OpenID Connect provider @@ -841,7 +841,7 @@ If you do not set `required_groups` or leave the setting empty, any user authent } ``` -1. Save the file and [reconfigure GitLab](../restart_gitlab.md#installations-from-source) +1. Save the file and [reconfigure GitLab](../restart_gitlab.md#self-compiled-installations) for the changes to take effect. ::EndTabs @@ -924,7 +924,7 @@ based on group membership, configure GitLab to identify: } ``` -1. Save the file and [reconfigure GitLab](../restart_gitlab.md#installations-from-source) +1. Save the file and [reconfigure GitLab](../restart_gitlab.md#self-compiled-installations) for the changes to take effect. ::EndTabs @@ -1005,7 +1005,7 @@ response to assign users as auditors based on group membership, configure GitLab } ``` -1. Save the file and [reconfigure GitLab](../restart_gitlab.md#installations-from-source) +1. Save the file and [reconfigure GitLab](../restart_gitlab.md#self-compiled-installations) for the changes to take effect. ::EndTabs @@ -1086,7 +1086,7 @@ response to assign users as administrator based on group membership, configure G } ``` -1. Save the file and [reconfigure GitLab](../restart_gitlab.md#installations-from-source) +1. Save the file and [reconfigure GitLab](../restart_gitlab.md#self-compiled-installations) for the changes to take effect. ::EndTabs diff --git a/doc/administration/auth/smartcard.md b/doc/administration/auth/smartcard.md index 5802db78dd6..1662639dd29 100644 --- a/doc/administration/auth/smartcard.md +++ b/doc/administration/auth/smartcard.md @@ -230,7 +230,7 @@ For self-compiled installations: Assign a value to at least one of the following variables: `client_certificate_required_host` or `client_certificate_required_port`. -1. Save the file and [restart](../restart_gitlab.md#installations-from-source) +1. Save the file and [restart](../restart_gitlab.md#self-compiled-installations) GitLab for the changes to take effect. ### Additional steps when using SAN extensions @@ -260,7 +260,7 @@ For self-compiled installations: san_extensions: true ``` -1. Save the file and [restart](../restart_gitlab.md#installations-from-source) +1. Save the file and [restart](../restart_gitlab.md#self-compiled-installations) GitLab for the changes to take effect. ### Additional steps when authenticating against an LDAP server @@ -297,7 +297,7 @@ For self-compiled installations: smartcard_auth: optional ``` -1. Save the file and [restart](../restart_gitlab.md#installations-from-source) +1. Save the file and [restart](../restart_gitlab.md#self-compiled-installations) GitLab for the changes to take effect. ### Require browser session with smartcard sign-in for Git access @@ -325,7 +325,7 @@ For self-compiled installations: required_for_git_access: true ``` -1. Save the file and [restart](../restart_gitlab.md#installations-from-source) +1. Save the file and [restart](../restart_gitlab.md#self-compiled-installations) GitLab for the changes to take effect. ## Passwords for users created via smartcard authentication |