diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-05-30 21:08:01 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-05-30 21:08:01 +0300 |
| commit | 2655ac9cd596526f2ea89a86e4f615139ee40fc4 (patch) | |
| tree | 7347acf40d1f2aa6bcd928334cea4d2d0df7b6ad /doc/user | |
| parent | aad78b57896307fff73539719d510a8c82be77f9 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/user')
| -rw-r--r-- | doc/user/application_security/container_scanning/index.md | 2 | ||||
| -rw-r--r-- | doc/user/clusters/agent/install/index.md | 2 | ||||
| -rw-r--r-- | doc/user/group/saml_sso/example_saml_config.md | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/doc/user/application_security/container_scanning/index.md b/doc/user/application_security/container_scanning/index.md index 7a82f98425a..042ed0190c4 100644 --- a/doc/user/application_security/container_scanning/index.md +++ b/doc/user/application_security/container_scanning/index.md @@ -220,7 +220,7 @@ The `CS_DISABLE_LANGUAGE_VULNERABILITY_SCAN` CI/CD variable controls whether the findings related to programming languages. The languages supported depend on the [scanner used](#change-scanners): -- [Trivy](https://aquasecurity.github.io/trivy/latest/docs/vulnerability/detection/language/). +- [Trivy](https://aquasecurity.github.io/trivy/v0.41/docs/scanner/vulnerability/language/) - [Grype](https://github.com/anchore/grype#features). By default, the report only includes packages managed by the Operating System (OS) package manager diff --git a/doc/user/clusters/agent/install/index.md b/doc/user/clusters/agent/install/index.md index 1bcbb42fc8e..e91bcd6e330 100644 --- a/doc/user/clusters/agent/install/index.md +++ b/doc/user/clusters/agent/install/index.md @@ -144,7 +144,7 @@ When [KAS](../../../../administration/clusters/kas.md) is behind a self-signed c you can set the value of `config.caCert` to the certificate. For example: ```shell -helm update --install gitlab-agent gitlab/gitlab-agent \ +helm upgrade --install gitlab-agent gitlab/gitlab-agent \ --set-file config.caCert=my-custom-ca.pem ``` diff --git a/doc/user/group/saml_sso/example_saml_config.md b/doc/user/group/saml_sso/example_saml_config.md index 524a5d5a9bd..f2db36e80b1 100644 --- a/doc/user/group/saml_sso/example_saml_config.md +++ b/doc/user/group/saml_sso/example_saml_config.md @@ -58,7 +58,7 @@ Attribute mapping: NOTE: Using the **Group ID** source attribute requires users to enter the group ID or object ID when configuring SAML group links. If available, use the **sAMAccountName** source attribute for the friendly group name instead. -[Azure AD limits the number of groups that can be sent in a SAML response to 150](https://support.esri.com/en-us/knowledge-base/000022190'). If a user is a member of more than 150 groups, Azure does not include that user's group claim in the SAML response. +[Azure AD limits the number of groups that can be sent in a SAML response to 150](https://support.esri.com/en-us/knowledge-base/000022190). If a user is a member of more than 150 groups, Azure does not include that user's group claim in the SAML response. ## Google Workspace |