summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAchilleas Pipinellis <axil@gitlab.com>2018-07-05 17:31:56 +0000
committerAchilleas Pipinellis <axil@gitlab.com>2018-07-05 17:31:56 +0000
commit4d2e24edd9fd1d038aceb4191454a409bcabe602 (patch)
treed1c0a9c753c0b545e4ea6be4636646afb6bce0ba
parent1e98a10af37257324b4e85324dddb48714551aea (diff)
parent48e7d497107d8905bbe3bec5f7290339b1a4f6f7 (diff)
downloadgitlab-ce-4d2e24edd9fd1d038aceb4191454a409bcabe602.tar.gz
Merge branch 'docs/container-scanning-note' into 'master'
Verify version on container scanning note See merge request gitlab-org/gitlab-ce!20409
-rw-r--r--doc/ci/examples/container_scanning.md4
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/ci/examples/container_scanning.md b/doc/ci/examples/container_scanning.md
index af87c83a4e5..0f79f7d1b17 100644
--- a/doc/ci/examples/container_scanning.md
+++ b/doc/ci/examples/container_scanning.md
@@ -57,9 +57,9 @@ so, the CI/CD job must be named `container_scanning` and the artifact path must
[Learn more on container scanning results shown in merge requests](https://docs.gitlab.com/ee/user/project/merge_requests/container_scanning.html).
CAUTION: **Caution:**
-Container Scanning was previously using `sast:container` for job name and
+Before GitLab 11.0, Container Scanning was previously using `sast:container` for job name and
`gl-sast-container-report.json` for the artifact name. While these old names
-are still maintained they have been deprecated with GitLab 11.0 and may be removed
+are still maintained, they have been deprecated with GitLab 11.0 and may be removed
in next major release, GitLab 12.0. You are advised to update your current `.gitlab-ci.yml`
configuration to reflect that change.