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:
authorGitLab Bot <gitlab-bot@gitlab.com>2021-05-19 12:10:19 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2021-05-19 12:10:19 +0300
commit389312d00908adf98b30daac746805ec8447f92b (patch)
tree22409e071143486cd7d72eeefd115ce634f43c84 /app/mailers
parente173c316de15057b099a93053c9ef16180d6d1de (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/mailers')
-rw-r--r--app/mailers/emails/in_product_marketing.rb5
1 files changed, 3 insertions, 2 deletions
diff --git a/app/mailers/emails/in_product_marketing.rb b/app/mailers/emails/in_product_marketing.rb
index 97243660512..e745cd51a55 100644
--- a/app/mailers/emails/in_product_marketing.rb
+++ b/app/mailers/emails/in_product_marketing.rb
@@ -14,8 +14,9 @@ module Emails
def in_product_marketing_email(recipient_id, group_id, track, series)
group = Group.find(group_id)
- email = User.find(recipient_id).notification_email_for(group)
- @message = Gitlab::Email::Message::InProductMarketing.for(track).new(group: group, series: series)
+ user = User.find(recipient_id)
+ email = user.notification_email_for(group)
+ @message = Gitlab::Email::Message::InProductMarketing.for(track).new(group: group, user: user, series: series)
mail_to(to: email, subject: @message.subject_line)
end