diff options
Diffstat (limited to 'app/mailers')
-rw-r--r-- | app/mailers/emails/in_product_marketing.rb | 6 | ||||
-rw-r--r-- | app/mailers/emails/merge_requests.rb | 14 | ||||
-rw-r--r-- | app/mailers/emails/projects.rb | 14 | ||||
-rw-r--r-- | app/mailers/previews/notify_preview.rb | 4 |
4 files changed, 38 insertions, 0 deletions
diff --git a/app/mailers/emails/in_product_marketing.rb b/app/mailers/emails/in_product_marketing.rb index 317e1545350..1b46d4841b0 100644 --- a/app/mailers/emails/in_product_marketing.rb +++ b/app/mailers/emails/in_product_marketing.rb @@ -21,6 +21,12 @@ module Emails mail_to(to: email, subject: @message.subject_line) end + def build_ios_app_guide_email(recipient_email) + @message = ::Gitlab::Email::Message::BuildIosAppGuide.new + + mail_to(to: recipient_email, subject: @message.subject_line) + end + private def mail_to(to:, subject:) diff --git a/app/mailers/emails/merge_requests.rb b/app/mailers/emails/merge_requests.rb index 341accaea32..5cbc3c9ef9c 100644 --- a/app/mailers/emails/merge_requests.rb +++ b/app/mailers/emails/merge_requests.rb @@ -155,6 +155,20 @@ module Emails end end + def approved_merge_request_email(recipient_id, merge_request_id, approved_by_user_id, reason = nil) + setup_merge_request_mail(merge_request_id, recipient_id) + + @approved_by = User.find(approved_by_user_id) + mail_answer_thread(@merge_request, merge_request_thread_options(approved_by_user_id, reason)) + end + + def unapproved_merge_request_email(recipient_id, merge_request_id, unapproved_by_user_id, reason = nil) + setup_merge_request_mail(merge_request_id, recipient_id) + + @unapproved_by = User.find(unapproved_by_user_id) + mail_answer_thread(@merge_request, merge_request_thread_options(unapproved_by_user_id, reason)) + end + private def setup_merge_request_mail(merge_request_id, recipient_id, present: false) diff --git a/app/mailers/emails/projects.rb b/app/mailers/emails/projects.rb index 14c724b5b91..efc6ce163c0 100644 --- a/app/mailers/emails/projects.rb +++ b/app/mailers/emails/projects.rb @@ -68,6 +68,20 @@ module Emails mail(to: user.notification_email_for(@project.group), subject: subject(subject_text)) end + def inactive_project_deletion_warning_email(project, user, deletion_date) + @project = project + @user = user + @deletion_date = deletion_date + subject_text = "Action required: Project #{project.name} is scheduled to be deleted on " \ + "#{deletion_date} due to inactivity" + + mail(to: user.notification_email_for(project.group), + subject: subject(subject_text)) do |format| + format.html { render layout: 'mailer' } + format.text { render layout: 'mailer' } + end + end + private def add_alert_headers diff --git a/app/mailers/previews/notify_preview.rb b/app/mailers/previews/notify_preview.rb index e7c8964a733..60d59465165 100644 --- a/app/mailers/previews/notify_preview.rb +++ b/app/mailers/previews/notify_preview.rb @@ -201,6 +201,10 @@ class NotifyPreview < ActionMailer::Preview Notify.merge_when_pipeline_succeeds_email(user.id, merge_request.id, user.id).message end + def inactive_project_deletion_warning + Notify.inactive_project_deletion_warning_email(project, user, '2022-04-22').message + end + private def project |