deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

inslude author & assignee to note notification recipients

Browse source
This commit is contained in:
Dmitriy Zaporozhets 2013-03-28 14:51:25 +02:00
parent 618249734b
commit 70947fedda
2 changed files with 60 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/services/notification_service.rb
View file

@ -106,12 +106,14 @@ class NotificationService
if note.commit_id
opts.merge!(commit_id: note.commit_id)
recipients = [note.commit_author]
else
opts.merge!(noteable_id: note.noteable_id)
recipients = [note.noteable.try(:author), note.noteable.try(:assignee)]
end
# Get users who left comment in thread
recipients = User.where(id: Note.where(opts).pluck(:author_id))
recipients = recipients.concat(User.where(id: Note.where(opts).pluck(:author_id)))
# Merge project watchers
recipients = recipients.concat(project_watchers(note.project)).compact.uniq