Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/doc/user
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2021-11-15 00:10:13 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2021-11-15 00:10:13 +0300
commit4b5042946065b750131e51790b84fe4a5aa7aa02 (patch)
treeb77dd045dd8c3ff626686d005e8d5f8578f70a0a /doc/user
parentf8f619856f4437343c81a1fbc1da6c59995fe98d (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/user')
-rw-r--r--doc/user/application_security/index.md2
-rw-r--r--doc/user/application_security/sast/index.md5
2 files changed, 3 insertions, 4 deletions
diff --git a/doc/user/application_security/index.md b/doc/user/application_security/index.md
index c595b228337..d5e801ced9c 100644
--- a/doc/user/application_security/index.md
+++ b/doc/user/application_security/index.md
@@ -226,7 +226,7 @@ To enable or edit the Vulnerability-Check rule:
1. On the top bar, select **Menu > Projects** and find your project.
1. On the left sidebar, select **Settings > General**.
1. Expand **Merge request approvals**.
-1. Select **Enable** or **Edit**.
+1. Select **Activate** or **Edit** of the Vulnerability-Check.
1. Complete the fields. **Approvals required** must be at least 1.
1. Select **Add approval rule**.
diff --git a/doc/user/application_security/sast/index.md b/doc/user/application_security/sast/index.md
index 720140418a0..af8585c6a18 100644
--- a/doc/user/application_security/sast/index.md
+++ b/doc/user/application_security/sast/index.md
@@ -16,9 +16,8 @@ explains how 4 of the top 6 attacks were application based. Download it to learn
organization.
If you're using [GitLab CI/CD](../../../ci/index.md), you can use Static Application Security
-Testing (SAST) to check your source code for known vulnerabilities. When a pipeline completes,
-the results of the SAST analysis are processed and shown in the pipeline's Security tab. If the
-pipeline is associated with a merge request, the SAST analysis is compared with the results of
+Testing (SAST) to check your source code for known vulnerabilities.
+If the pipeline is associated with a merge request, the SAST analysis is compared with the results of
the target branch's analysis (if available). The results of that comparison are shown in the merge
request. If the pipeline is running from the default branch, the results of the SAST
analysis are available in the [security dashboards](../security_dashboard/index.md).