Commit 9eddaca4 authored by Russell Dickenson's avatar Russell Dickenson

Merge branch 'distinguish-ultimate-security-features-better' into 'master'

Docs: Distinguish Ultimate security features better

See merge request gitlab-org/gitlab!74375
parents 1529d089 5442d2b3
...@@ -226,7 +226,7 @@ To enable or edit the Vulnerability-Check rule: ...@@ -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 top bar, select **Menu > Projects** and find your project.
1. On the left sidebar, select **Settings > General**. 1. On the left sidebar, select **Settings > General**.
1. Expand **Merge request approvals**. 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. Complete the fields. **Approvals required** must be at least 1.
1. Select **Add approval rule**. 1. Select **Add approval rule**.
......
...@@ -16,9 +16,8 @@ explains how 4 of the top 6 attacks were application based. Download it to learn ...@@ -16,9 +16,8 @@ explains how 4 of the top 6 attacks were application based. Download it to learn
organization. organization.
If you're using [GitLab CI/CD](../../../ci/index.md), you can use Static Application Security 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, Testing (SAST) to check your source code for known vulnerabilities.
the results of the SAST analysis are processed and shown in the pipeline's Security tab. If the If the pipeline is associated with a merge request, the SAST analysis is compared with the results of
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 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 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). analysis are available in the [security dashboards](../security_dashboard/index.md).
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment