diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-27 21:09:21 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-27 21:09:21 +0300 |
| commit | e0fa0638a422c3e20d4423c9bb69d79afc9c7d3d (patch) | |
| tree | 9abb3c0706576bbda895fe9539a55556930606e2 /doc/user | |
| parent | f8d15ca65390475e356b06dedc51e10ccd179f86 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/user')
| -rw-r--r-- | doc/user/application_security/license_compliance/index.md | 2 | ||||
| -rw-r--r-- | doc/user/profile/notifications.md | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/doc/user/application_security/license_compliance/index.md b/doc/user/application_security/license_compliance/index.md index dfe7a714f6c..03a7ffd195a 100644 --- a/doc/user/application_security/license_compliance/index.md +++ b/doc/user/application_security/license_compliance/index.md @@ -216,7 +216,7 @@ If you're using a custom setup for License Compliance, you're required to update your CI config accordingly: 1. Change the CI template to `License-Scanning.gitlab-ci.yml`. -1. Change the job name to `license_management` (if you mention it in `.gitlab-ci.yml`). +1. Change the job name to `license_scanning` (if you mention it in `.gitlab-ci.yml`). 1. Change the artifact name to `gl-license-scanning-report.json` (if you mention it in `.gitlab-ci.yml`). For example, the following `.gitlab-ci.yml`: diff --git a/doc/user/profile/notifications.md b/doc/user/profile/notifications.md index 96ae8d04e03..588c471bb64 100644 --- a/doc/user/profile/notifications.md +++ b/doc/user/profile/notifications.md @@ -178,7 +178,8 @@ In most of the below cases, the notification will be sent to: | Remove milestone merge request | Subscribers, participants mentioned, and Custom notification level with this event selected | | New comment | The above, plus anyone mentioned by `@username` in the comment, with notification level "Mention" or higher | | Failed pipeline | The author of the pipeline | -| Successful pipeline | The author of the pipeline, if they have the custom notification setting for successful pipelines set | +| Fixed pipeline | The author of the pipeline | +| Successful pipeline | The author of the pipeline, if they have the custom notification setting for successful pipelines set. If the pipeline failed previously, a `Fixed pipeline` message will be sent for the first successful pipeline after the failure, then a `Successful pipeline` message for any further successful pipelines. | | New epic **(ULTIMATE)** | | | Close epic **(ULTIMATE)** | | | Reopen epic **(ULTIMATE)** | | |