diff options
Diffstat (limited to 'doc/user')
| -rw-r--r-- | doc/user/application_security/security_dashboard/index.md | 6 | ||||
| -rw-r--r-- | doc/user/profile/notifications.md | 12 |
2 files changed, 11 insertions, 7 deletions
diff --git a/doc/user/application_security/security_dashboard/index.md b/doc/user/application_security/security_dashboard/index.md index a0cfd6d9d77..488ec336646 100644 --- a/doc/user/application_security/security_dashboard/index.md +++ b/doc/user/application_security/security_dashboard/index.md @@ -52,6 +52,9 @@ To view vulnerabilities in a pipeline: 1. From the list, select the pipeline you want to check for vulnerabilities. 1. Select the **Security** tab. +**Scan details** shows vulnerabilities introduced by the merge request, in addition to existing vulnerabilities +from the latest successful pipeline in your project's default branch. + A pipeline consists of multiple jobs, such as SAST and DAST scans. If a job fails to finish, the security dashboard doesn't show SAST scanner output. For example, if the SAST job finishes but the DAST job fails, the security dashboard doesn't show SAST results. On failure, @@ -66,7 +69,8 @@ To view the total number of vulnerabilities per scan: 1. Select the **Status** of a branch. 1. Select the **Security** tab. -**Scan details** show the total number of vulnerabilities found per scan in the pipeline. +**Scan details** shows vulnerabilities introduced by the merge request, in addition to existing vulnerabilities +from the latest successful pipeline in your project's default branch. ### Download security scan outputs diff --git a/doc/user/profile/notifications.md b/doc/user/profile/notifications.md index c5460a31701..d0e9b427f1c 100644 --- a/doc/user/profile/notifications.md +++ b/doc/user/profile/notifications.md @@ -245,26 +245,26 @@ epics: | Event | Sent to | |------------------------|---------| -| Change milestone issue | Subscribers, participants mentioned, and Custom notification level with this event selected. | -| Change milestone merge request | Subscribers, participants mentioned, and Custom notification level with this event selected. | +| Change milestone issue | Subscribers and participants mentioned. | +| Change milestone merge request | Subscribers and participants mentioned. | | Close epic | | | Close issue | | | Close merge request | | -| Due issue | Participants and Custom notification level with this event selected. | | Failed pipeline | The author of the pipeline. | | Fixed pipeline | The author of the pipeline. Enabled by default. _[Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/24309) in GitLab 13.1._ | +| Issue due | Participants and Custom notification level with this event selected. | | Merge merge request | | | Merge when pipeline succeeds | Author, Participants, Watchers, Subscribers, and Custom notification level with this event selected. Custom notification level is ignored for Author, Watchers and Subscribers. _[Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/211961) in GitLab 13.4._ | | Merge request [marked as ready](../project/merge_requests/drafts.md) | Watchers and participants. _[Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/15332) in GitLab 13.10._ | -| New comment | Participants, Watchers, Subscribers, and Custom notification level with this event selected. Also anyone mentioned by username in the comment, with notification level "Mention" or higher. | | New epic | | | New issue | | | New merge request | | +| New note | Participants, Watchers, Subscribers, and Custom notification level with this event selected. Also anyone mentioned by username in the comment, with notification level "Mention" or higher. | | Push to merge request | Participants and Custom notification level with this event selected. | | Reassign issue | Participants, Watchers, Subscribers, Custom notification level with this event selected, and the old assignee. | | Reassign merge request | Participants, Watchers, Subscribers, Custom notification level with this event selected, and the old assignee. | -| Remove milestone issue | Subscribers, participants mentioned, and Custom notification level with this event selected. | -| Remove milestone merge request | Subscribers, participants mentioned, and Custom notification level with this event selected. | +| Remove milestone issue | Subscribers and participants mentioned. | +| Remove milestone merge request | Subscribers and participants mentioned. | | Reopen epic | | | Reopen issue | | | Reopen merge request | | |