Merge branch 'ci-services-migrate' into 'master'

Ci Services migrate



See merge request !1985

4 files changed, 69 insertions, 0 deletions

diff --git a/app/views/notify/build_fail_email.html.haml b/app/views/notify/build_fail_email.html.haml
new file mode 100644
index 00000000000..3b251dc011a
--- /dev/null
+++ b/app/views/notify/build_fail_email.html.haml
@@ -0,0 +1,23 @@
+- content_for :header do
+  %h1{style: "background: #c40834; color: #FFF; font: normal 20px Helvetica, Arial, sans-serif; margin: 0; padding: 5px 10px; line-height: 32px; font-size: 16px;"}
+    GitLab (build failed)
+%h3
+  Project:
+  = link_to ci_project_url(@project) do
+    = @project.name
+
+%p
+  Commit: #{link_to @build.short_sha, namespace_project_commit_url(@build.gl_project.namespace, @build.gl_project, @build.sha)}
+%p
+  Author: #{@build.commit.git_author_name}
+%p
+  Branch: #{@build.ref}
+%p
+  Stage: #{@build.stage}
+%p
+  Job: #{@build.name}
+%p
+  Message: #{@build.commit.git_commit_message}
+
+%p
+  Build details: #{link_to "Build #{@build.id}", namespace_project_build_url(@build.gl_project.namespace, @build.gl_project, @build)}
diff --git a/app/views/notify/build_fail_email.text.erb b/app/views/notify/build_fail_email.text.erb
new file mode 100644
index 00000000000..17a3b9b1d33
--- /dev/null
+++ b/app/views/notify/build_fail_email.text.erb
@@ -0,0 +1,11 @@
+Build failed for <%= @project.name %>
+
+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/notify/build_success_email.html.haml b/app/views/notify/build_success_email.html.haml
new file mode 100644
index 00000000000..c23f4b7e45a
--- /dev/null
+++ b/app/views/notify/build_success_email.html.haml
@@ -0,0 +1,24 @@
+- content_for :header do
+  %h1{style: "background: #38CF5B; color: #FFF; font: normal 20px Helvetica, Arial, sans-serif; margin: 0; padding: 5px 10px; line-height: 32px; font-size: 16px;"}
+    GitLab (build successful)
+
+%h3
+  Project:
+  = link_to ci_project_url(@project) do
+    = @project.name
+
+%p
+  Commit: #{link_to @build.short_sha, namespace_project_commit_url(@build.gl_project.namespace, @build.gl_project, @build.sha)}
+%p
+  Author: #{@build.commit.git_author_name}
+%p
+  Branch: #{@build.ref}
+%p
+  Stage: #{@build.stage}
+%p
+  Job: #{@build.name}
+%p
+  Message: #{@build.commit.git_commit_message}
+
+%p
+  Build details: #{link_to "Build #{@build.id}", namespace_project_build_url(@build.gl_project.namespace, @build.gl_project, @build)}
diff --git a/app/views/notify/build_success_email.text.erb b/app/views/notify/build_success_email.text.erb
new file mode 100644
index 00000000000..bc8b978c3d7
--- /dev/null
+++ b/app/views/notify/build_success_email.text.erb
@@ -0,0 +1,11 @@
+Build successful for <%= @project.name %>
+
+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) %>