summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSean McGivern <sean@gitlab.com>2016-11-23 16:21:45 +0000
committerSean McGivern <sean@gitlab.com>2016-11-28 19:40:48 +0000
commit87a2762b8b001aa8b8d715c964f5ce99d2585ead (patch)
tree14ad76b3dd1be9e24cc1cf1c43ae2cfb04be5845
parent93f6fcc91e5f241aeef13e96a16bbb6f4027e2fe (diff)
downloadgitlab-ce-87a2762b8b001aa8b8d715c964f5ce99d2585ead.tar.gz
Don't use diff_line_content for emails
-rw-r--r--app/helpers/diff_helper.rb4
-rw-r--r--app/views/projects/diffs/_line.html.haml2
2 files changed, 2 insertions, 4 deletions
diff --git a/app/helpers/diff_helper.rb b/app/helpers/diff_helper.rb
index ce16d971dc6..f489f9aa0d6 100644
--- a/app/helpers/diff_helper.rb
+++ b/app/helpers/diff_helper.rb
@@ -51,11 +51,9 @@ module DiffHelper
html.html_safe
end
- def diff_line_content(line, email: false)
+ def diff_line_content(line)
if line.blank?
"&nbsp;".html_safe
- elsif email
- line.html_safe
else
line.sub(/^[\-+ ]/, '').html_safe
end
diff --git a/app/views/projects/diffs/_line.html.haml b/app/views/projects/diffs/_line.html.haml
index bf2519d4f1c..16c96b66714 100644
--- a/app/views/projects/diffs/_line.html.haml
+++ b/app/views/projects/diffs/_line.html.haml
@@ -25,7 +25,7 @@
%a{href: "##{line_code}", data: { linenumber: link_text }}
%td.line_content.noteable_line{ class: type, data: (diff_view_line_data(line_code, diff_file.position(line), type) unless plain) }<
- if email
- %pre= diff_line_content(line.text, email: true)
+ %pre= line.text
- else
= diff_line_content(line.text)