Merge branch 'ci-build-name-in-notification-email' into 'master'

CHANGELOG

@@ -17,6 +17,7 @@ v 8.2.0 (unreleased)
   - Fix: Inability to reply to code comments in the MR view, if the MR comes from a fork
   - Use git follow flag for commits page when retrieve history for file or directory
   - Show merge request CI status on merge requests index page
+  - Send build name and stage in CI notification e-mail
   - Extend yml syntax for only and except to support specifying repository path
   - Enable shared runners to all new projects
   - Fix: 500 error returned if destroy request without HTTP referer (Kazuki Shimizu)

app/views/ci/notify/build_fail_email.html.haml

@@ -13,6 +13,10 @@
 %p
   Branch: #{@build.ref}
 %p
+  Stage: #{@build.stage}
+%p
+  Job: #{@build.name}
+%p
   Message: #{@build.commit.git_commit_message}
 
 %p

app/views/ci/notify/build_fail_email.text.erb

@@ -4,6 +4,8 @@ Status:   <%= @build.status %>
 Commit:   <%= @build.commit.short_sha %>
 Author:   <%= @build.commit.git_author_name %>
 Branch:   <%= @build.ref %>
+Stage:    <%= @build.stage %>
+Job:      <%= @build.name %>
 Message:  <%= @build.commit.git_commit_message %>
 
 Url:      <%= namespace_project_build_url(@build.gl_project.namespace, @build.gl_project, @build) %>

app/views/ci/notify/build_success_email.html.haml

@@ -14,6 +14,10 @@
 %p
   Branch: #{@build.ref}
 %p
+  Stage: #{@build.stage}
+%p
+  Job: #{@build.name}
+%p
   Message: #{@build.commit.git_commit_message}
 
 %p

app/views/ci/notify/build_success_email.text.erb

@@ -4,6 +4,8 @@ Status:   <%= @build.status %>
 Commit:   <%= @build.commit.short_sha %>
 Author:   <%= @build.commit.git_author_name %>
 Branch:   <%= @build.ref %>
+Stage:    <%= @build.stage %>
+Job:      <%= @build.name %>
 Message:  <%= @build.commit.git_commit_message %>
 
 Url:      <%= namespace_project_build_url(@build.gl_project.namespace, @build.gl_project, @build) %>