diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2015-11-10 22:04:08 +0000 |
|---|---|---|
| committer | Kamil Trzciński <ayufan@ayufan.eu> | 2015-11-10 22:04:08 +0000 |
| commit | dfa09789061bbd3891c17ebbcc23f7bd6b95336c (patch) | |
| tree | 260e1721170d25a3588d20b29b92a62364469671 /app/views/ci | |
| parent | 83ec84946ca8b0b71ae201de65991635c50dd518 (diff) | |
| parent | e8d97eb118ecbfe2a77abf2dcd56d7ab1cfac62a (diff) | |
| download | gitlab-ce-dfa09789061bbd3891c17ebbcc23f7bd6b95336c.tar.gz | |
Merge branch 'ci-build-name-in-notification-email' into 'master'
Send build name and stage in CI notification e-mail
See merge request !1776
Diffstat (limited to 'app/views/ci')
| -rw-r--r-- | app/views/ci/notify/build_fail_email.html.haml | 4 | ||||
| -rw-r--r-- | app/views/ci/notify/build_fail_email.text.erb | 2 | ||||
| -rw-r--r-- | app/views/ci/notify/build_success_email.html.haml | 4 | ||||
| -rw-r--r-- | app/views/ci/notify/build_success_email.text.erb | 2 |
4 files changed, 12 insertions, 0 deletions
diff --git a/app/views/ci/notify/build_fail_email.html.haml b/app/views/ci/notify/build_fail_email.html.haml index cefb75040e9..b0aaea89075 100644 --- a/app/views/ci/notify/build_fail_email.html.haml +++ b/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 diff --git a/app/views/ci/notify/build_fail_email.text.erb b/app/views/ci/notify/build_fail_email.text.erb index 6de5dc10f17..17a3b9b1d33 100644 --- a/app/views/ci/notify/build_fail_email.text.erb +++ b/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) %> diff --git a/app/views/ci/notify/build_success_email.html.haml b/app/views/ci/notify/build_success_email.html.haml index 617b88f7345..24c439e50eb 100644 --- a/app/views/ci/notify/build_success_email.html.haml +++ b/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 diff --git a/app/views/ci/notify/build_success_email.text.erb b/app/views/ci/notify/build_success_email.text.erb index d0a43ae1c12..bc8b978c3d7 100644 --- a/app/views/ci/notify/build_success_email.text.erb +++ b/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) %> |