update subject and email header message

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

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;"}
                              

app/views/notify/pipeline_failed_email.text.erb

-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) %> )

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;"}
                              

app/views/notify/pipeline_success_email.text.erb

-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) %> )