summaryrefslogtreecommitdiff
path: root/app/views
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2015-03-31 12:30:09 +0200
committerDouwe Maan <douwe@gitlab.com>2015-03-31 12:36:36 +0200
commit08eac512bdcd9181476afc3e4bc0b132ebd48478 (patch)
tree34a86c79d0e73309c3c1daf27cb2f6de046ae4e6 /app/views
parent33a8f53f7a8fdc40d0f0ee4245258c8dba99198a (diff)
downloadgitlab-ce-08eac512bdcd9181476afc3e4bc0b132ebd48478.tar.gz
Move EmailsOnPush highlight CSS inline instead of being in every notification email.
Diffstat (limited to 'app/views')
-rw-r--r--app/views/layouts/notify.html.haml3
-rw-r--r--app/views/notify/repository_push_email.html.haml3
2 files changed, 2 insertions, 4 deletions
diff --git a/app/views/layouts/notify.html.haml b/app/views/layouts/notify.html.haml
index 7eec93abdf6..00c7cedce40 100644
--- a/app/views/layouts/notify.html.haml
+++ b/app/views/layouts/notify.html.haml
@@ -27,8 +27,7 @@
}
.file-stats .deleted-file {
color: #B00;
- }
- #{add_email_highlight_css}
+ }}
%body
%div.content
= yield
diff --git a/app/views/notify/repository_push_email.html.haml b/app/views/notify/repository_push_email.html.haml
index bbf7004c906..a374a662333 100644
--- a/app/views/notify/repository_push_email.html.haml
+++ b/app/views/notify/repository_push_email.html.haml
@@ -59,8 +59,7 @@
%strong
= diff.new_path
%hr
- %pre
- = color_email_diff(diff.diff)
+ = color_email_diff(diff.diff)
%br
- if @compare.timeout