diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-02-10 06:09:31 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-02-10 06:09:31 +0300 |
commit | 8de5e388c6046487419a11cb97924a762250c427 (patch) | |
tree | 5e350d487171a0a88d97e0c320b3dfb2e871fb15 /app | |
parent | 5a120c32fda1c88e38bbce056d6f30f4a2f41bc6 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app')
-rw-r--r-- | app/models/note.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/note.rb b/app/models/note.rb index 92b5b4e4e5e..d169d88149b 100644 --- a/app/models/note.rb +++ b/app/models/note.rb @@ -542,7 +542,7 @@ class Note < ApplicationRecord end def skip_notification? - review.present? || author.ghost? + review.present? || author.blocked? || author.ghost? end private |