diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2024-01-12 03:08:51 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2024-01-12 03:08:51 +0300 |
commit | 98a00b024553a603e16380b93fc3f89a169bf438 (patch) | |
tree | 4a6dade546a6857bffc21df2126b113528d746d9 /doc/user | |
parent | c53e365d68ee800702befb15adfdfac708d5de6f (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 | 3 | ||||
-rw-r--r-- | doc/user/compliance/license_list.md | 10 |
2 files changed, 11 insertions, 2 deletions
diff --git a/doc/user/application_security/container_scanning/index.md b/doc/user/application_security/container_scanning/index.md index 9cb27be9d08..5be9e169078 100644 --- a/doc/user/application_security/container_scanning/index.md +++ b/doc/user/application_security/container_scanning/index.md @@ -379,6 +379,9 @@ The following options are available: | [Grype](https://github.com/anchore/grype) | `registry.gitlab.com/security-products/container-scanning/grype:6` | | Trivy | `registry.gitlab.com/security-products/container-scanning/trivy:6` | +WARNING: +Do not use the `:latest` tag when selecting the scanner image. + ### Setting the default branch image > [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/338877) in GitLab 14.5. diff --git a/doc/user/compliance/license_list.md b/doc/user/compliance/license_list.md index 43d76845ffa..3bfc5612db9 100644 --- a/doc/user/compliance/license_list.md +++ b/doc/user/compliance/license_list.md @@ -4,9 +4,13 @@ group: Threat Insights info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://handbook.gitlab.com/handbook/product/ux/technical-writing/#assignments --- -# License list **(ULTIMATE ALL)** +<!--- start_remove The following content will be removed on remove_date: '2024-08-15' --> -> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/13582) in GitLab 12.7. +# License list (deprecated) **(ULTIMATE ALL)** + +WARNING: +This feature was [deprecated](https://gitlab.com/gitlab-org/gitlab/-/issues/436100) in GitLab 16.8 +and is planned for removal in 17.0. Use the [Dependency List](../application_security/dependency_list/index.md) instead. The License list allows you to see your project's licenses and key details about them. @@ -32,3 +36,5 @@ The licenses are displayed, where: - **Policy Violation:** The license has a [license policy](license_approval_policies.md) marked as **Deny**. ![License List](img/license_list_v13_0.png) + +<!--- end_remove --> |