Commit a1684d14 authored by Heinrich Lee Yu's avatar Heinrich Lee Yu

Simplify notification check for participating

parent f7ec4df5
...@@ -50,7 +50,7 @@ class NotificationRecipient ...@@ -50,7 +50,7 @@ class NotificationRecipient
when :mention when :mention
@type == :mention @type == :mention
when :participating when :participating
!excluded_participating_action? && %i[participating mention watch].include?(@type) @custom_action == :failed_pipeline || %i[participating mention].include?(@type)
when :custom when :custom
custom_enabled? || %i[participating mention].include?(@type) custom_enabled? || %i[participating mention].include?(@type)
when :watch when :watch
...@@ -106,12 +106,6 @@ class NotificationRecipient ...@@ -106,12 +106,6 @@ class NotificationRecipient
NotificationSetting::EXCLUDED_WATCHER_EVENTS.include?(@custom_action) NotificationSetting::EXCLUDED_WATCHER_EVENTS.include?(@custom_action)
end end
def excluded_participating_action?
return false unless @custom_action
NotificationSetting::EXCLUDED_PARTICIPATING_EVENTS.include?(@custom_action)
end
private private
def read_ability def read_ability
......
...@@ -54,14 +54,11 @@ class NotificationSetting < ApplicationRecord ...@@ -54,14 +54,11 @@ class NotificationSetting < ApplicationRecord
self.class.email_events(source) self.class.email_events(source)
end end
EXCLUDED_PARTICIPATING_EVENTS = [
:success_pipeline
].freeze
EXCLUDED_WATCHER_EVENTS = [ EXCLUDED_WATCHER_EVENTS = [
:push_to_merge_request, :push_to_merge_request,
:issue_due :issue_due,
].push(*EXCLUDED_PARTICIPATING_EVENTS).freeze :success_pipeline
].freeze
def self.find_or_create_for(source) def self.find_or_create_for(source)
setting = find_or_initialize_by(source: source) setting = find_or_initialize_by(source: source)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment