Merge branch 'remove-successful-pipeline-emails-for-now' into 'master'
Make successful pipeline emails off for watchers Closes #24845 See merge request !8176
This commit is contained in:
commit
583deef209
4 changed files with 13 additions and 2 deletions
|
@ -37,6 +37,10 @@ class NotificationSetting < ActiveRecord::Base
|
||||||
:success_pipeline
|
:success_pipeline
|
||||||
]
|
]
|
||||||
|
|
||||||
|
EXCLUDED_WATCHER_EVENTS = [
|
||||||
|
:success_pipeline
|
||||||
|
]
|
||||||
|
|
||||||
store :events, accessors: EMAIL_EVENTS, coder: JSON
|
store :events, accessors: EMAIL_EVENTS, coder: JSON
|
||||||
|
|
||||||
before_create :set_events
|
before_create :set_events
|
||||||
|
|
|
@ -591,7 +591,10 @@ class NotificationService
|
||||||
custom_action = build_custom_key(action, target)
|
custom_action = build_custom_key(action, target)
|
||||||
|
|
||||||
recipients = target.participants(current_user)
|
recipients = target.participants(current_user)
|
||||||
recipients = add_project_watchers(recipients, project)
|
|
||||||
|
unless NotificationSetting::EXCLUDED_WATCHER_EVENTS.include?(custom_action)
|
||||||
|
recipients = add_project_watchers(recipients, project)
|
||||||
|
end
|
||||||
|
|
||||||
recipients = add_custom_notifications(recipients, project, custom_action)
|
recipients = add_custom_notifications(recipients, project, custom_action)
|
||||||
recipients = reject_mention_users(recipients, project)
|
recipients = reject_mention_users(recipients, project)
|
||||||
|
|
|
@ -0,0 +1,4 @@
|
||||||
|
---
|
||||||
|
title: Make successful pipeline emails off for watchers
|
||||||
|
merge_request: 8176
|
||||||
|
author:
|
|
@ -73,7 +73,7 @@ In all of the below cases, the notification will be sent to:
|
||||||
|
|
||||||
...with notification level "Participating" or higher
|
...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
|
- 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
|
- Custom: Users with notification level "custom" who turned on notifications for any of the events present in the table below
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue