diff --git a/doc/user/group/security_dashboard/index.md b/doc/user/group/security_dashboard/index.md index 6e190199607ea63c3604b1313a8b70a954fecd6e..21c43109b9bcec8d5536cd0835171f74aaa604d9 100644 --- a/doc/user/group/security_dashboard/index.md +++ b/doc/user/group/security_dashboard/index.md @@ -88,7 +88,8 @@ If you hover over a row, there will appear some actions you can take: Clicking the "More info" button opens a modal with more information about the selected vulnerability where you can get a better description, as well as the file it came from, and a possible solution. You get access to the -["Dismiss vulnerability"](#dismissing-a-vulnerability) and +["Dismiss vulnerability"](#dismissing-a-vulnerability), +["Create merge request"](#create-a-merge-request-from-a-vulnerability), and ["Create issue"](#creating-an-issue-for-a-vulnerability) buttons inside this modal as well. @@ -110,6 +111,21 @@ will now have an associated issue next to the name. You can get the same result if you select the **Create issue** button from inside the "More info" modal. +### Create a Merge Request from a vulnerability + +> [Introduced](https://gitlab.com/gitlab-org/gitlab-ee/issues/9224) in + [GitLab Ultimate](https://about.gitlab.com/pricing) 11.9. + +In certain cases, GitLab will allow you to create a merge request that will +automatically remediate the vulnerability. + +Clicking on the "Create merge request" button inside the more info modal will create +a merge request onto the default branch, then redirect you to that merge request. + +CAUTION: **Warning:** Automatic Patch creation is only available for a subset of +[Dependency Scanning](../../project/merge_requests/dependency_scanning.md). At the moment only Node.JS projects +managed with yarn are supported. + ### Dismissing a vulnerability You can also dismiss vulnerabilities by clicking the "Dismiss vulnerability" button. diff --git a/doc/user/project/merge_requests/img/create-issue-with-list-hover.png b/doc/user/project/merge_requests/img/create-issue-with-list-hover.png new file mode 100644 index 0000000000000000000000000000000000000000..7d70e8299f52612d8de0a0a8b97effa174028b80 Binary files /dev/null and b/doc/user/project/merge_requests/img/create-issue-with-list-hover.png differ diff --git a/doc/user/project/merge_requests/index.md b/doc/user/project/merge_requests/index.md index 11d5269e38645b82eb3a88e4d8d4bb8faed71caa..e8e5b238c80a4ca07214453d0b4f0ab51fa3cd50 100644 --- a/doc/user/project/merge_requests/index.md +++ b/doc/user/project/merge_requests/index.md @@ -376,6 +376,19 @@ Some Vulnerabilities can be fixed by applying a patch that is automatically gene ![Solutions for dependency scanning](img/vulnerability_solution.png) +### Create a merge request from a vulnerability **[ULTIMATE]** + +> Introduced in [GitLab Ultimate][products] 11.9. + +CAUTION: **Warning:** Automatic Patch creation is only available for a subset of [Dependency Scanning](dependency_scanning.md). At the moment only Node.JS projects managed with yarn are supported. + +Any vulnerability that has a [solution](#solutions-for-dependency-scanning-ultimate) can have a merge request created to automatically solve the issue. + +If this action is available there will be a "Create merge request" button in the vulnerability modal. +Clicking on this button will create a merge request to apply the solution onto the source branch. + +![Create merge request from vulnerability](img/create-issue-with-list-hover.png) + ## Live preview with Review Apps If you configured [Review Apps](https://about.gitlab.com/features/review-apps/) for your project, diff --git a/ee/changelogs/unreleased/10409-documentation-for-auto-remediation.yml b/ee/changelogs/unreleased/10409-documentation-for-auto-remediation.yml new file mode 100644 index 0000000000000000000000000000000000000000..d7fc1fddea5131c6832a926d4180d9fc7e86a961 --- /dev/null +++ b/ee/changelogs/unreleased/10409-documentation-for-auto-remediation.yml @@ -0,0 +1,5 @@ +--- +title: Adds documentation for autoremediation +merge_request: 10054 +author: +type: other