Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorValery Sizov <valery@gitlab.com>2017-03-23 21:21:24 +0300
committerValery Sizov <valery@gitlab.com>2017-03-27 20:54:08 +0300
commit7b64b205d57ba46b0a3a814aa8bab48e724d15ee (patch)
treedcf7f3655d411cc59bea1474e9253e04422fb936 /app/mailers
parent3f98525fc359845e0d919ba9de674723e9fb4ecd (diff)
[Multiple issue assignees] Fixes for notification, todos, system notes[ci skip]
Diffstat (limited to 'app/mailers')
-rw-r--r--app/mailers/emails/issues.rb6
1 files changed, 4 insertions, 2 deletions
diff --git a/app/mailers/emails/issues.rb b/app/mailers/emails/issues.rb
index d64e48f774b..0f847841295 100644
--- a/app/mailers/emails/issues.rb
+++ b/app/mailers/emails/issues.rb
@@ -11,10 +11,12 @@ module Emails
mail_answer_thread(@issue, issue_thread_options(updated_by_user_id, recipient_id))
end
- def reassigned_issue_email(recipient_id, issue_id, previous_assignee_id, updated_by_user_id)
+ def reassigned_issue_email(recipient_id, issue_id, previous_assignee_ids, updated_by_user_id)
setup_issue_mail(issue_id, recipient_id)
- @previous_assignee = User.find_by(id: previous_assignee_id) if previous_assignee_id
+ @previous_assignees = []
+ @previous_assignees = User.where(id: previous_assignee_ids) if previous_assignee_ids.any?
+
mail_answer_thread(@issue, issue_thread_options(updated_by_user_id, recipient_id))
end