summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2017-04-04 00:29:50 +0000
committerRémy Coutable <remy@rymai.me>2017-04-04 00:29:50 +0000
commitaea21a12babbd922438545ae339d6d2ad0159de8 (patch)
tree5846357fcc6ed465f64e612fb23f5bfec671cdc6 /doc
parenta3b1ff40fc5e3c4f3983487355b88af5f583d29f (diff)
parenta1805cbcd55a28658049b42c12a87a50ab9ab977 (diff)
downloadgitlab-ce-aea21a12babbd922438545ae339d6d2ad0159de8.tar.gz
Merge branch 'quiet-pipelines' into 'master'
Quiet pipeline emails Closes #24845 See merge request !10333
Diffstat (limited to 'doc')
-rw-r--r--doc/workflow/notifications.md7
1 files changed, 3 insertions, 4 deletions
diff --git a/doc/workflow/notifications.md b/doc/workflow/notifications.md
index 4c52974e103..e91d36987a9 100644
--- a/doc/workflow/notifications.md
+++ b/doc/workflow/notifications.md
@@ -66,14 +66,13 @@ Below is the table of events users can be notified of:
In all of the below cases, the notification will be sent to:
- Participants:
- the author and assignee of the issue/merge request
- - the author of the pipeline
- authors of comments on the issue/merge request
- anyone mentioned by `@username` in the issue/merge request title or description
- anyone mentioned by `@username` in any of the comments on the issue/merge request
...with notification level "Participating" or higher
-- Watchers: users with notification level "Watch" (however successful pipeline would be off for watchers)
+- Watchers: users with notification level "Watch"
- Subscribers: anyone who manually subscribed to the issue/merge request
- Custom: Users with notification level "custom" who turned on notifications for any of the events present in the table below
@@ -89,8 +88,8 @@ In all of the below cases, the notification will be sent to:
| Reopen merge request | |
| Merge merge request | |
| New comment | The above, plus anyone mentioned by `@username` in the comment, with notification level "Mention" or higher |
-| Failed pipeline | The above, plus the author of the pipeline |
-| Successful pipeline | The above, plus the author of the pipeline |
+| 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 |
In addition, if the title or description of an Issue or Merge Request is