diff options
| -rw-r--r-- | app/mailers/emails/pipelines.rb | 6 | ||||
| -rw-r--r-- | app/views/notify/pipeline_failed_email.html.haml | 2 | ||||
| -rw-r--r-- | app/views/notify/pipeline_failed_email.text.erb | 2 | ||||
| -rw-r--r-- | app/views/notify/pipeline_success_email.html.haml | 2 | ||||
| -rw-r--r-- | app/views/notify/pipeline_success_email.text.erb | 2 |
5 files changed, 8 insertions, 6 deletions
diff --git a/app/mailers/emails/pipelines.rb b/app/mailers/emails/pipelines.rb index 2b2b7a4f08c..9aae39fa220 100644 --- a/app/mailers/emails/pipelines.rb +++ b/app/mailers/emails/pipelines.rb @@ -34,8 +34,10 @@ module Emails end def pipeline_subject(status) - subject( - "Pipeline #{status} for #{@project.name}", @pipeline.short_sha) + ref = @pipeline.short_sha + ref << " in #{@merge_request.to_reference}" if @merge_request + + subject("Pipeline ##{@pipeline.id} has #{status}", ref) end end end diff --git a/app/views/notify/pipeline_failed_email.html.haml b/app/views/notify/pipeline_failed_email.html.haml index 179b1586e8f..3b3212e675e 100644 --- a/app/views/notify/pipeline_failed_email.html.haml +++ b/app/views/notify/pipeline_failed_email.html.haml @@ -65,7 +65,7 @@ %td{:style => "font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;vertical-align:middle;color:#ffffff;text-align:center;padding-right:5px;"} %img{:alt => "x", :height => "13", :src => image_url('mailers/ci_pipeline_notif_v1/icon-x-red-inverted.gif'), :style => "display:block;", :width => "13"}/ %td{:style => "font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;vertical-align:middle;color:#ffffff;text-align:center;"} - Uh oh, your CI pipeline has failed. + Your pipeline has failed. %tr.spacer %td{:style => "font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;height:18px;font-size:18px;line-height:18px;"} diff --git a/app/views/notify/pipeline_failed_email.text.erb b/app/views/notify/pipeline_failed_email.text.erb index f6d6f3119d3..373d5020b28 100644 --- a/app/views/notify/pipeline_failed_email.text.erb +++ b/app/views/notify/pipeline_failed_email.text.erb @@ -1,4 +1,4 @@ -Uh oh, your CI pipeline has failed. +Your pipeline has failed. Project: <%= @project.name %> ( <%= namespace_project_url(@project.namespace, @project) %> ) Branch: <%= @pipeline.ref %> ( <%= namespace_project_commits_url(@project.namespace, @project, @pipeline.ref) %> ) diff --git a/app/views/notify/pipeline_success_email.html.haml b/app/views/notify/pipeline_success_email.html.haml index a21f71124cb..ff9c3059acc 100644 --- a/app/views/notify/pipeline_success_email.html.haml +++ b/app/views/notify/pipeline_success_email.html.haml @@ -65,7 +65,7 @@ %td{:style => "font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;vertical-align:middle;color:#ffffff;text-align:center;padding-right:5px;"} %img{:alt => "✓", :height => "13", :src => image_url('mailers/ci_pipeline_notif_v1/icon-check-green-inverted.gif'), :style => "display:block;", :width => "13"}/ %td{:style => "font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;vertical-align:middle;color:#ffffff;text-align:center;"} - Success! Your CI pipeline has passed. + Your pipeline has passed. %tr.spacer %td{:style => "font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;height:18px;font-size:18px;line-height:18px;"} diff --git a/app/views/notify/pipeline_success_email.text.erb b/app/views/notify/pipeline_success_email.text.erb index 9a0f839d089..c38a738f523 100644 --- a/app/views/notify/pipeline_success_email.text.erb +++ b/app/views/notify/pipeline_success_email.text.erb @@ -1,4 +1,4 @@ -Success! Your CI pipeline has passed. +Your pipeline has passed. Project: <%= @project.name %> ( <%= namespace_project_url(@project.namespace, @project) %> ) Branch: <%= @pipeline.ref %> ( <%= namespace_project_commits_url(@project.namespace, @project, @pipeline.ref) %> ) |