summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorMario de la Ossa <mariodelaossa@gmail.com>2018-03-15 19:05:44 -0600
committerMario de la Ossa <mariodelaossa@gmail.com>2018-03-19 12:13:03 -0600
commit4cb3b71d9dcb447883abbc2086834bb36e4e72de (patch)
tree5f46dd3c78e20e857f5f44ae066d3a15effc33a9 /app
parentfeb95ce3412ae3ab8b2c990b8ddf64d8d8945670 (diff)
downloadgitlab-ce-4cb3b71d9dcb447883abbc2086834bb36e4e72de.tar.gz
Always notify new mentions even if explicitly unsubscribed43933-always-notify-mentions
Diffstat (limited to 'app')
-rw-r--r--app/models/notification_recipient.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/app/models/notification_recipient.rb b/app/models/notification_recipient.rb
index fd70e920c7e..e95655e19f8 100644
--- a/app/models/notification_recipient.rb
+++ b/app/models/notification_recipient.rb
@@ -35,7 +35,8 @@ class NotificationRecipient
# check this last because it's expensive
# nobody should receive notifications if they've specifically unsubscribed
- return false if unsubscribed?
+ # except if they were mentioned.
+ return false if @type != :mention && unsubscribed?
true
end