Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorhttp://jneen.net/ <jneen@jneen.net>2017-07-26 08:24:22 +0300
committerhttp://jneen.net/ <jneen@jneen.net>2017-08-03 19:06:15 +0300
commita4932d2da72af14eeea99e466117bdb767d111c7 (patch)
treec4bcd130481d05f547fd9853d3a12b11f3bf7913 /app/services/notification_recipient_service.rb
parentb69e81c3e993939228046516be897233dcaf4442 (diff)
don't elevate to :watch if no @custom_action is provided
Diffstat (limited to 'app/services/notification_recipient_service.rb')
-rw-r--r--app/services/notification_recipient_service.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/services/notification_recipient_service.rb b/app/services/notification_recipient_service.rb
index f944c1ae7f4..20d8a06903c 100644
--- a/app/services/notification_recipient_service.rb
+++ b/app/services/notification_recipient_service.rb
@@ -52,7 +52,7 @@ class NotificationRecipientService
@notification_level ||=
case raw_notification_level
when :custom
- if !@custom_action || notification_setting.event_enabled?(@custom_action)
+ if @custom_action && notification_setting.event_enabled?(@custom_action)
:watch
else
:custom