diff options
| author | Valery Sizov <valery@gitlab.com> | 2015-04-22 14:26:10 +0000 |
|---|---|---|
| committer | Valery Sizov <valery@gitlab.com> | 2015-04-22 14:26:10 +0000 |
| commit | ec2cb2fd11b794830d1ba65e6e6e299b87604074 (patch) | |
| tree | 064a56f60902f169619390194d720a1ea9481839 | |
| parent | 759875387cab016897ec17c924ca3cea94c22387 (diff) | |
| parent | af90e837710bd49bb9cc1d535bfb94eed2ac26ba (diff) | |
| download | gitlab-ci-ec2cb2fd11b794830d1ba65e6e6e299b87604074.tar.gz | |
Merge branch 'templates' into 'master'
Improve email templates
https://dev.gitlab.org/gitlab/gitlab-ci/issues/166
See merge request !75
| -rw-r--r-- | app/views/layouts/notify.html.haml | 10 | ||||
| -rw-r--r-- | app/views/notify/build_fail_email.html.haml | 5 | ||||
| -rw-r--r-- | app/views/notify/build_success_email.html.haml | 6 |
3 files changed, 11 insertions, 10 deletions
diff --git a/app/views/layouts/notify.html.haml b/app/views/layouts/notify.html.haml index d3882e7..270b206 100644 --- a/app/views/layouts/notify.html.haml +++ b/app/views/layouts/notify.html.haml @@ -5,15 +5,9 @@ GitLab CI %body - %h1{style: "background: #228899; color: #FFF; font: normal 20px Helvetica, Arial, sans-serif; margin: 0; padding: 5px 10px; line-height: 32px; font-size: 16px;"} - GitLab CI - %table{align: "left", border: "0", cellpadding: "0", cellspacing: "0", style: "padding: 10px 0;", width: "100%"} - - if @project - %tr - %td{align: "left", style: "margin: 0; padding: 10px;"} - = link_to @project.name, project_url(@project), style: 'color: #29B; text-decoration: none' - %br + = yield :header + %table{align: "left", border: "0", cellpadding: "0", cellspacing: "0", style: "padding: 10px 0;", width: "100%"} %tr %td{align: "left", style: "margin: 0; padding: 10px;"} = yield diff --git a/app/views/notify/build_fail_email.html.haml b/app/views/notify/build_fail_email.html.haml index 5937e5f..fc1f7e1 100644 --- a/app/views/notify/build_fail_email.html.haml +++ b/app/views/notify/build_fail_email.html.haml @@ -1,4 +1,7 @@ -%p +- 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 CI (build failed) +%h3 Build failed for = link_to project_url(@project) do = @project.name diff --git a/app/views/notify/build_success_email.html.haml b/app/views/notify/build_success_email.html.haml index 5575c98..1ae293d 100644 --- a/app/views/notify/build_success_email.html.haml +++ b/app/views/notify/build_success_email.html.haml @@ -1,4 +1,8 @@ -%p +- 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 CI (build successful) + +%h3 Build successful for = link_to project_url(@project) do = @project.name |