summaryrefslogtreecommitdiff
path: root/app/mailers
diff options
context:
space:
mode:
authorMike Greiling <mike@pixelcog.com>2016-10-06 10:09:24 -0500
committerMike Greiling <mike@pixelcog.com>2016-10-06 10:09:24 -0500
commit60caeb14a75f6700a3df6b73b7320737c4256ab2 (patch)
treee37d93b8b131ecc5940f7463a27b4912f267a2eb /app/mailers
parent585e02546fa08c62ae53a8f951b01bbc8f6fb08a (diff)
downloadgitlab-ce-60caeb14a75f6700a3df6b73b7320737c4256ab2.tar.gz
update subject and email header message
Diffstat (limited to 'app/mailers')
-rw-r--r--app/mailers/emails/pipelines.rb6
1 files changed, 4 insertions, 2 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