Add latest changes from gitlab-org/gitlab@master

2 files changed, 18 insertions, 0 deletions

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