diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-27 12:08:28 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-27 12:08:28 +0300 |
| commit | 6ac4a6713ed3196af899011f7e18658e16ebaac0 (patch) | |
| tree | c60237cb5203d171481b765d31bfead080d063cf /app/models | |
| parent | d2b64c37bdef067656fdc8deb4728a2fbc6c2729 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/notification_recipient.rb | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/app/models/notification_recipient.rb b/app/models/notification_recipient.rb index 107d00d055a..36b7cd64c73 100644 --- a/app/models/notification_recipient.rb +++ b/app/models/notification_recipient.rb @@ -74,10 +74,12 @@ class NotificationRecipient end def unsubscribed? - return false unless @target - return false unless @target.respond_to?(:subscriptions) + subscribable_target = @target.is_a?(Note) ? @target.noteable : @target - subscription = @target.subscriptions.find { |subscription| subscription.user_id == @user.id } + return false unless subscribable_target + return false unless subscribable_target.respond_to?(:subscriptions) + + subscription = subscribable_target.subscriptions.find { |subscription| subscription.user_id == @user.id } subscription && !subscription.subscribed end |