summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTrevor Knudsen <tknudsen@gitlab.com>2019-06-13 16:16:11 +0000
committerTrevor Knudsen <tknudsen@gitlab.com>2019-06-13 16:16:11 +0000
commitee458c91578570c377e8f451303b45abf507b70e (patch)
treeced408c2468db7c5581def1c21ad1257611eb3da
parent1efd580cae90f210b3e88e4c4a51d20947b746b7 (diff)
parent5b4ff65475b795b368e2e1068873540c2a4cc2d6 (diff)
downloadgitlab-ce-ee458c91578570c377e8f451303b45abf507b70e.tar.gz
Merge branch 'pprokic-master-patch-44643' into 'master'
Update application-security index.md's (SAST,DAST,LM and DS) See merge request gitlab-org/gitlab-ce!29547
-rw-r--r--doc/user/application_security/dast/index.md2
-rw-r--r--doc/user/application_security/dependency_scanning/index.md3
-rw-r--r--doc/user/application_security/license_management/index.md2
-rw-r--r--doc/user/application_security/sast/index.md2
4 files changed, 4 insertions, 5 deletions
diff --git a/doc/user/application_security/dast/index.md b/doc/user/application_security/dast/index.md
index 028ff72a160..a722aa88f9d 100644
--- a/doc/user/application_security/dast/index.md
+++ b/doc/user/application_security/dast/index.md
@@ -58,7 +58,7 @@ To enable DAST in your project, define a job in your `.gitlab-ci.yml` file that
This can be done in two ways:
-- For GitLab 11.9 and later, including the provided DAST `.gitlab-ci.yml` template (recommended).
+- For GitLab 11.9 and later, including the provided `DAST.gitlab-ci.yml` template (recommended).
- Manually specifying the job definition. Not recommended unless using GitLab
11.8 and earlier.
diff --git a/doc/user/application_security/dependency_scanning/index.md b/doc/user/application_security/dependency_scanning/index.md
index c65f369244a..f3bf743ad03 100644
--- a/doc/user/application_security/dependency_scanning/index.md
+++ b/doc/user/application_security/dependency_scanning/index.md
@@ -66,8 +66,7 @@ file that generates the
This can be done in two ways:
-- For GitLab 11.9 and later, including the provided Dependency Scanning
- `.gitlab-ci.yml` template (recommended).
+- For GitLab 11.9 and later, including the provided `Dependency-Scanning.gitlab-ci.yml` template (recommended).
- Manually specifying the job definition. Not recommended unless using GitLab
11.8 and earlier.
diff --git a/doc/user/application_security/license_management/index.md b/doc/user/application_security/license_management/index.md
index 8b75995c377..7878dc77084 100644
--- a/doc/user/application_security/license_management/index.md
+++ b/doc/user/application_security/license_management/index.md
@@ -65,7 +65,7 @@ file that generates the [License Management report artifact](../../../ci/yaml/RE
This can be done in two ways:
-- For GitLab 11.9 and later, including the provided License Management `.gitlab-ci.yml` template (recommended).
+- For GitLab 11.9 and later, including the provided `License-Management.gitlab-ci.yml` template (recommended).
- Manually specifying the job definition. Not recommended unless using GitLab
11.8 and earlier.
diff --git a/doc/user/application_security/sast/index.md b/doc/user/application_security/sast/index.md
index 19befb04b76..11361f8ad89 100644
--- a/doc/user/application_security/sast/index.md
+++ b/doc/user/application_security/sast/index.md
@@ -80,7 +80,7 @@ To enable SAST in your project, define a job in your `.gitlab-ci.yml` file that
This can be done in two ways:
-- For GitLab 11.9 and later, including the provided SAST `.gitlab-ci.yml` template (recommended).
+- For GitLab 11.9 and later, including the provided `SAST.gitlab-ci.yml` template (recommended).
- Manually specifying the job definition. Not recommended unless using GitLab
11.8 and earlier.