summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEvan Read <eread@gitlab.com>2018-10-30 03:25:10 +0000
committerEvan Read <eread@gitlab.com>2018-10-30 03:25:10 +0000
commit67d97e3bcc6f4d96e5be1ce14dbcf5c132b1db64 (patch)
tree2b4de271dc37546c71615aac6f5a0494bc49309d
parentaf80955baaf0993aed07cae943391f7b57d9e3ae (diff)
parent9e2f585ced11a94a13487d22e2b7aef87fc912cb (diff)
downloadgitlab-ce-67d97e3bcc6f4d96e5be1ce14dbcf5c132b1db64.tar.gz
Merge branch 'docs-add_deprecation_notice_for_renamed_licensed_feature-ce' into 'master'
docs: Add deprecation notice for renamed licensed feature See merge request gitlab-org/gitlab-ce!22575
-rw-r--r--doc/ci/examples/container_scanning.md6
1 files changed, 6 insertions, 0 deletions
diff --git a/doc/ci/examples/container_scanning.md b/doc/ci/examples/container_scanning.md
index 0f79f7d1b17..bc948dc6ea9 100644
--- a/doc/ci/examples/container_scanning.md
+++ b/doc/ci/examples/container_scanning.md
@@ -63,4 +63,10 @@ are still maintained, they have been deprecated with GitLab 11.0 and may be remo
in next major release, GitLab 12.0. You are advised to update your current `.gitlab-ci.yml`
configuration to reflect that change.
+CAUTION: **Caution:**
+Starting with GitLab 11.5, Container Scanning feature is licensed under the name `container_scanning`.
+While the old name `sast_container` is still maintained, it has been deprecated with GitLab 11.5 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 if you are using the `$GITLAB_FEATURES` environment variable.
+
[ee]: https://about.gitlab.com/pricing/