summaryrefslogtreecommitdiff
path: root/app/mailers/previews
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2019-11-12 21:06:30 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2019-11-12 21:06:30 +0000
commit6e3880e2bb5a404467c64edc916d9edf7556d09d (patch)
tree95cfb0de65623b7015b9d1a8c9ebb559a9358033 /app/mailers/previews
parent6d31b8f052d30b7e55128d17b66bceed8c6065a9 (diff)
downloadgitlab-ce-6e3880e2bb5a404467c64edc916d9edf7556d09d.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/mailers/previews')
-rw-r--r--app/mailers/previews/notify_preview.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/app/mailers/previews/notify_preview.rb b/app/mailers/previews/notify_preview.rb
index 3d42423ba46..381a4f54d9e 100644
--- a/app/mailers/previews/notify_preview.rb
+++ b/app/mailers/previews/notify_preview.rb
@@ -77,7 +77,7 @@ class NotifyPreview < ActionMailer::Preview
end
def import_issues_csv_email
- Notify.import_issues_csv_email(user, project, { success: 3, errors: [5, 6, 7], valid_file: true })
+ Notify.import_issues_csv_email(user.id, project.id, { success: 3, errors: [5, 6, 7], valid_file: true })
end
def closed_merge_request_email
@@ -109,11 +109,11 @@ class NotifyPreview < ActionMailer::Preview
end
def member_access_requested_email
- Notify.member_access_requested_email('group', user.id, user.id).message
+ Notify.member_access_requested_email(member.source_type, member.id, user.id).message
end
def member_invite_accepted_email
- Notify.member_invite_accepted_email('project', user.id).message
+ Notify.member_invite_accepted_email(member.source_type, member.id).message
end
def member_invite_declined_email