diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-09-30 15:06:01 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-09-30 15:06:01 +0300 |
commit | dea6ebd31af8e97e8b14160181bd4ea7578c94e8 (patch) | |
tree | 5e429fda4d43aa3450f7d6b015668c3474cd9e6c /app/mailers/emails/issues.rb | |
parent | 94611567bd03083e0ecef7a582a174aa34844482 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/mailers/emails/issues.rb')
-rw-r--r-- | app/mailers/emails/issues.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/mailers/emails/issues.rb b/app/mailers/emails/issues.rb index 47d15836da0..3fd865003c1 100644 --- a/app/mailers/emails/issues.rb +++ b/app/mailers/emails/issues.rb @@ -85,7 +85,7 @@ module Emails @project = Project.find(project_id) @results = results - mail(to: recipient(@user.id, @project.group), subject: subject('Imported issues')) do |format| + mail(to: @user.notification_email_for(@project.group), subject: subject('Imported issues')) do |format| format.html { render layout: 'mailer' } format.text { render layout: 'mailer' } end @@ -105,7 +105,7 @@ module Emails def issue_thread_options(sender_id, recipient_id, reason) { from: sender(sender_id), - to: recipient(recipient_id, @project.group), + to: User.find(recipient_id).notification_email_for(@project.group), subject: subject("#{@issue.title} (##{@issue.iid})"), 'X-GitLab-NotificationReason' => reason } |