From 08eac512bdcd9181476afc3e4bc0b132ebd48478 Mon Sep 17 00:00:00 2001
From: Douwe Maan <douwe@gitlab.com>
Date: Tue, 31 Mar 2015 12:30:09 +0200
Subject: [PATCH] Move EmailsOnPush highlight CSS inline instead of being in
every notification email.
---
app/helpers/emails_helper.rb | 6 +-----
app/views/layouts/notify.html.haml | 3 +--
app/views/notify/repository_push_email.html.haml | 3 +--
3 files changed, 3 insertions(+), 9 deletions(-)
diff --git a/app/helpers/emails_helper.rb b/app/helpers/emails_helper.rb
index 08476f8516e..6c253213c3b 100644
--- a/app/helpers/emails_helper.rb
+++ b/app/helpers/emails_helper.rb
@@ -33,12 +33,8 @@ module EmailsHelper
end
end
- def add_email_highlight_css
- Rugments::Themes::Github.render(scope: '.highlight')
- end
-
def color_email_diff(diffcontent)
- formatter = Rugments::Formatters::HTML.new(cssclass: 'highlight')
+ formatter = Rugments::Formatters::HTML.new(cssclass: "highlight", inline_theme: :github)
lexer = Rugments::Lexers::Diff.new
raw formatter.format(lexer.lex(diffcontent))
end
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
--
GitLab