Fix Note notification for entities without assignee

Dmitriy Zaporozhets
1 parent 5ad4be29
Showing 1 changed file with 4 additions and 1 deletions Show diff stats
app/services/notification_service.rb
@@ -109,7 +109,10 @@ class NotificationService
       recipients = [note.commit_author]
     else
       opts.merge!(noteable_id: note.noteable_id)
-      recipients = [note.noteable.try(:author), note.noteable.try(:assignee)]
+      target = note.noteable
+      recipients = []
+      recipients << target.assignee if target.respond_to?(:assignee)
+      recipients << target.author if target.respond_to?(:author)
     end
  
     # Get users who left comment in thread
...	...	@@ -109,7 +109,10 @@ class NotificationService
109	109	recipients = [note.commit_author]
110	110	else
111	111	opts.merge!(noteable_id: note.noteable_id)
112		- recipients = [note.noteable.try(:author), note.noteable.try(:assignee)]
	112	+ target = note.noteable
	113	+ recipients = []
	114	+ recipients << target.assignee if target.respond_to?(:assignee)
	115	+ recipients << target.author if target.respond_to?(:author)
113	116	end
114	117
115	118	# Get users who left comment in thread
...	...