diff options
author | Robert Speicher <rspeicher@gmail.com> | 2019-01-08 05:03:00 +0300 |
---|---|---|
committer | Robert Speicher <rspeicher@gmail.com> | 2019-01-08 05:03:00 +0300 |
commit | d0bb16fcdc38c6491ff48daf139ae41e55b355ca (patch) | |
tree | 66679c94edf0e98eda497305fadc49d404d89548 /app/mailers | |
parent | f2fee7bc6b363774fb1c8e1b154b529db2dff02c (diff) | |
parent | 710f2ec50c49d1e773acc20058ed584f1402de33 (diff) |
Merge branch 'master' into 11-7-stable
Diffstat (limited to 'app/mailers')
-rw-r--r-- | app/mailers/emails/issues.rb | 11 | ||||
-rw-r--r-- | app/mailers/previews/notify_preview.rb | 4 |
2 files changed, 15 insertions, 0 deletions
diff --git a/app/mailers/emails/issues.rb b/app/mailers/emails/issues.rb index 370e6d2f90b..654ae211310 100644 --- a/app/mailers/emails/issues.rb +++ b/app/mailers/emails/issues.rb @@ -77,6 +77,17 @@ module Emails mail_answer_thread(issue, issue_thread_options(updated_by_user.id, recipient.id, reason)) end + def import_issues_csv_email(user_id, project_id, results) + @user = User.find(user_id) + @project = Project.find(project_id) + @results = results + + mail(to: @user.notification_email, subject: subject('Imported issues')) do |format| + format.html { render layout: 'mailer' } + format.text { render layout: 'mailer' } + end + end + private def setup_issue_mail(issue_id, recipient_id) diff --git a/app/mailers/previews/notify_preview.rb b/app/mailers/previews/notify_preview.rb index 2ac4610967d..80e0a17c312 100644 --- a/app/mailers/previews/notify_preview.rb +++ b/app/mailers/previews/notify_preview.rb @@ -76,6 +76,10 @@ class NotifyPreview < ActionMailer::Preview Notify.changed_milestone_issue_email(user.id, issue.id, milestone, user.id) end + def import_issues_csv_email + Notify.import_issues_csv_email(user, project, { success: 3, errors: [5, 6, 7], valid_file: true }) + end + def closed_merge_request_email Notify.closed_merge_request_email(user.id, issue.id, user.id).message end |