summaryrefslogtreecommitdiff
path: root/doc/user/application_security/vulnerabilities/index.md
diff options
context:
space:
mode:
Diffstat (limited to 'doc/user/application_security/vulnerabilities/index.md')
-rw-r--r--doc/user/application_security/vulnerabilities/index.md28
1 files changed, 18 insertions, 10 deletions
diff --git a/doc/user/application_security/vulnerabilities/index.md b/doc/user/application_security/vulnerabilities/index.md
index b691a97fc32..b3128e49980 100644
--- a/doc/user/application_security/vulnerabilities/index.md
+++ b/doc/user/application_security/vulnerabilities/index.md
@@ -1,10 +1,13 @@
---
type: reference, howto
+stage: Secure
+group: Vulnerability Research
+info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/engineering/ux/technical-writing/#designated-technical-writers
---
# Standalone Vulnerability pages
-> [Introduced](https://gitlab.com/gitlab-org/gitlab/issues/13561) in [GitLab Ultimate](https://about.gitlab.com/pricing/) 13.0.
+> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/13561) in [GitLab Ultimate](https://about.gitlab.com/pricing/) 13.0.
Each security vulnerability in the [Vulnerability List](../dependency_list/index.md) has its own standalone
page.
@@ -17,7 +20,7 @@ several different ways:
- [Change the Vulnerability Status](#changing-vulnerability-status) - You can change the
status of a vulnerability to **Detected**, **Confirmed**, **Dismissed**, or **Resolved**.
- [Create issue](#creating-an-issue-for-a-vulnerability) - Create a new issue with the
- title and description prepopulated with information from the vulnerability report.
+ title and description pre-populated with information from the vulnerability report.
By default, such issues are [confidential](../../project/issues/confidential_issues.md).
- [Solution](#automatic-remediation-solutions-for-vulnerabilities) - For some vulnerabilities,
a solution is provided for how to fix the vulnerability.
@@ -39,7 +42,7 @@ the following values:
You can create an issue for a vulnerability by selecting the **Create issue** button.
This creates a [confidential issue](../../project/issues/confidential_issues.md) in the
-project the vulnerability came from, and prepopulates it with useful information from
+project the vulnerability came from, and pre-populates it with useful information from
the vulnerability report. After the issue is created, GitLab redirects you to the
issue page so you can edit, assign, or comment on the issue.
@@ -52,14 +55,19 @@ generates for you. GitLab supports the following scanners:
is only available for Node.js projects managed with `yarn`.
- [Container Scanning](../container_scanning/index.md).
+When an automatic solution is available, the button in the header will show "Resolve with merge request":
+
+![Resolve with Merge Request button](img/standalone_vulnerability_page_merge_request_button_v13_1.png)
+
+Selecting the button will create a merge request with the automatic solution.
+
### Manually applying a suggested patch
-To apply a patch automatically generated by GitLab to fix a vulnerability:
+To manually apply the patch that was generated by GitLab for a vulnerability, select the dropdown arrow on the "Resolve
+with merge request" button, then select the "Download patch to resolve" option:
+
+![Resolve with Merge Request button dropdown](img/standalone_vulnerability_page_merge_request_button_dropdown_v13_1.png)
-1. Open the issue created in [Create issue](#creating-an-issue-for-a-vulnerability).
-1. In the **Issue description**, scroll to **Solution** and download the linked patch file.
-1. Ensure your local project has the same commit checked out that was used to generate the patch.
-1. Run `git apply remediation.patch` to apply the patch.
-1. Verify and commit the changes to your branch.
+This will change the button text to "Download patch to resolve". Click on it to download the patch:
-![Apply patch for dependency scanning](../img/vulnerability_solution.png)
+![Download patch button](img/standalone_vulnerability_page_download_patch_button_v13_1.png)