diff options
| author | Lin Jen-Shin <godfat@godfat.org> | 2016-12-22 00:36:10 +0800 |
|---|---|---|
| committer | Lin Jen-Shin <godfat@godfat.org> | 2017-01-05 19:22:47 +0800 |
| commit | 365cdd8fe0d107257ba5af47b80b66f08217b6bc (patch) | |
| tree | 3d6cc4c1136ec9bd5e98cae0967a012a70d5d22a | |
| parent | 91e560124b241972f3ffe6b682f1501a9c209d4e (diff) | |
| download | gitlab-ce-365cdd8fe0d107257ba5af47b80b66f08217b6bc.tar.gz | |
Make successful pipeline emails off for watchers
Closes #24845
| -rw-r--r-- | app/services/notification_service.rb | 6 | ||||
| -rw-r--r-- | changelogs/unreleased/remove-successful-pipeline-emails-for-now.yml | 4 | ||||
| -rw-r--r-- | doc/workflow/notifications.md | 2 |
3 files changed, 10 insertions, 2 deletions
diff --git a/app/services/notification_service.rb b/app/services/notification_service.rb index 9a7af5730d2..75277d3ac12 100644 --- a/app/services/notification_service.rb +++ b/app/services/notification_service.rb @@ -591,7 +591,11 @@ class NotificationService custom_action = build_custom_key(action, target) recipients = target.participants(current_user) - recipients = add_project_watchers(recipients, project) + + # TODO: CLEAN ME UP! + unless custom_action == :success_pipeline + recipients = add_project_watchers(recipients, project) + end recipients = add_custom_notifications(recipients, project, custom_action) recipients = reject_mention_users(recipients, project) diff --git a/changelogs/unreleased/remove-successful-pipeline-emails-for-now.yml b/changelogs/unreleased/remove-successful-pipeline-emails-for-now.yml new file mode 100644 index 00000000000..47d484e5c84 --- /dev/null +++ b/changelogs/unreleased/remove-successful-pipeline-emails-for-now.yml @@ -0,0 +1,4 @@ +--- +title: Make successful pipeline emails off for watchers +merge_request: 8176 +author: diff --git a/doc/workflow/notifications.md b/doc/workflow/notifications.md index c936e8833c6..4c52974e103 100644 --- a/doc/workflow/notifications.md +++ b/doc/workflow/notifications.md @@ -73,7 +73,7 @@ In all of the below cases, the notification will be sent to: ...with notification level "Participating" or higher -- Watchers: users with notification level "Watch" +- Watchers: users with notification level "Watch" (however successful pipeline would be off for watchers) - 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 |