diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-27 18:09:21 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-27 18:09:21 +0000 |
| commit | e0fa0638a422c3e20d4423c9bb69d79afc9c7d3d (patch) | |
| tree | 9abb3c0706576bbda895fe9539a55556930606e2 /app/mailers | |
| parent | f8d15ca65390475e356b06dedc51e10ccd179f86 (diff) | |
| download | gitlab-ce-e0fa0638a422c3e20d4423c9bb69d79afc9c7d3d.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/mailers')
| -rw-r--r-- | app/mailers/emails/pipelines.rb | 4 | ||||
| -rw-r--r-- | app/mailers/previews/notify_preview.rb | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/app/mailers/emails/pipelines.rb b/app/mailers/emails/pipelines.rb index 773b9fead3a..f2538d28a1a 100644 --- a/app/mailers/emails/pipelines.rb +++ b/app/mailers/emails/pipelines.rb @@ -10,6 +10,10 @@ module Emails pipeline_mail(pipeline, recipients, 'failed') end + def pipeline_fixed_email(pipeline, recipients) + pipeline_mail(pipeline, recipients, 'been fixed') + end + private def pipeline_mail(pipeline, recipients, status) diff --git a/app/mailers/previews/notify_preview.rb b/app/mailers/previews/notify_preview.rb index 381a4f54d9e..114737eb232 100644 --- a/app/mailers/previews/notify_preview.rb +++ b/app/mailers/previews/notify_preview.rb @@ -145,6 +145,10 @@ class NotifyPreview < ActionMailer::Preview Notify.pipeline_failed_email(pipeline, pipeline.user.try(:email)) end + def pipeline_fixed_email + Notify.pipeline_fixed_email(pipeline, pipeline.user.try(:email)) + end + def autodevops_disabled_email Notify.autodevops_disabled_email(pipeline, user.email).message end |