diff options
Diffstat (limited to 'app/models/journal.rb')
| -rw-r--r-- | app/models/journal.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/models/journal.rb b/app/models/journal.rb index 24c02dfbd..4b4139a14 100644 --- a/app/models/journal.rb +++ b/app/models/journal.rb @@ -336,8 +336,8 @@ class Journal < ActiveRecord::Base end def add_watcher - if user && - user.allowed_to?(:add_issue_watchers, project) && + if user&.active? && + user&.allowed_to?(:add_issue_watchers, project) && user.pref.auto_watch_on?('issue_contributed_to') && !Watcher.any_watched?(Array.wrap(journalized), user) journalized.set_watcher(user, true) |