summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Mason <jmason@kloveair1.com>2014-12-16 16:19:25 -0800
committerJames Mason <jmason@kloveair1.com>2014-12-16 16:27:32 -0800
commit839332619b21db8200f22a39092e0e8e6f241afe (patch)
tree03e5bcb0ddcf8c09169ae20b66f2975ec85b8fbd
parent78f10f85204e3716894b19634dfb6985ce5970d7 (diff)
downloadgitlab-ci-839332619b21db8200f22a39092e0e8e6f241afe.tar.gz
Add branch and commit message to emails
-rw-r--r--CHANGELOG1
-rw-r--r--app/views/notify/build_fail_email.html.haml4
-rw-r--r--app/views/notify/build_fail_email.text.erb2
-rw-r--r--app/views/notify/build_success_email.html.haml4
-rw-r--r--app/views/notify/build_success_email.text.erb2
5 files changed, 13 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 5598b66..59a6cdb 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -3,6 +3,7 @@ v5.3
- Fix a style issue with the navbar
- Skip CSRF check on the project's build page
- Fix showing wrong build script on admin projects page
+ - Add branch and commit message to build result emails
v5.2
- Improve performance by adding new indicies
diff --git a/app/views/notify/build_fail_email.html.haml b/app/views/notify/build_fail_email.html.haml
index 7573e17..5937e5f 100644
--- a/app/views/notify/build_fail_email.html.haml
+++ b/app/views/notify/build_fail_email.html.haml
@@ -9,6 +9,10 @@
Commit: #{@build.commit.short_sha}
%p
Author: #{@build.commit.git_author_name}
+%p
+ Branch: #{@build.commit.ref}
+%p
+ Message: #{@build.commit.git_commit_message}
%p
Url: #{link_to @build.short_sha, project_build_url(@build.project, @build)}
diff --git a/app/views/notify/build_fail_email.text.erb b/app/views/notify/build_fail_email.text.erb
index ef2233c..9747c9d 100644
--- a/app/views/notify/build_fail_email.text.erb
+++ b/app/views/notify/build_fail_email.text.erb
@@ -3,5 +3,7 @@ Build failed for <%= @project.name %>
Status: <%= @build.status %>
Commit: <%= @build.commit.short_sha %>
Author: <%= @build.commit.git_author_name %>
+Branch: <%= @build.commit.ref %>
+Message: <%= @build.commit.git_commit_message %>
Url: <%= project_build_url(@build.project, @build) %>
diff --git a/app/views/notify/build_success_email.html.haml b/app/views/notify/build_success_email.html.haml
index 10ceba4..5575c98 100644
--- a/app/views/notify/build_success_email.html.haml
+++ b/app/views/notify/build_success_email.html.haml
@@ -9,6 +9,10 @@
Commit: #{@build.commit.short_sha}
%p
Author: #{@build.commit.git_author_name}
+%p
+ Branch: #{@build.commit.ref}
+%p
+ Message: #{@build.commit.git_commit_message}
%p
Url: #{link_to @build.short_sha, project_build_url(@build.project, @build)}
diff --git a/app/views/notify/build_success_email.text.erb b/app/views/notify/build_success_email.text.erb
index 5470a5b..62f338e 100644
--- a/app/views/notify/build_success_email.text.erb
+++ b/app/views/notify/build_success_email.text.erb
@@ -3,5 +3,7 @@ Build successful for <%= @project.name %>
Status: <%= @build.status %>
Commit: <%= @build.commit.short_sha %>
Author: <%= @build.commit.git_author_name %>
+Branch: <%= @build.commit.ref %>
+Message: <%= @build.commit.git_commit_message %>
Url: <%= project_build_url(@build.project, @build) %>