summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDouwe Maan <douwe@selenight.nl>2016-01-30 12:54:19 +0100
committerDouwe Maan <douwe@selenight.nl>2016-01-30 12:54:19 +0100
commit47afe7ae8ff33c756c9ff6e2339a82f07bf11c07 (patch)
tree7839ce38c302364f47780e53a6b9862e9dca6f38
parentfa0cbb13990a7e7edec55e9724e9c4d676743f3b (diff)
downloadgitlab-ce-rename-inline-diff.tar.gz
Fewer html_safesrename-inline-diff
-rw-r--r--app/helpers/diff_helper.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/helpers/diff_helper.rb b/app/helpers/diff_helper.rb
index 0b4fda12788..f9bacc8ba45 100644
--- a/app/helpers/diff_helper.rb
+++ b/app/helpers/diff_helper.rb
@@ -2,8 +2,8 @@ module DiffHelper
def mark_inline_diffs(old_line, new_line)
old_diffs, new_diffs = Gitlab::Diff::InlineDiff.new(old_line, new_line).inline_diffs
- marked_old_line = Gitlab::Diff::InlineDiffMarker.new(old_line).mark(old_diffs).html_safe
- marked_new_line = Gitlab::Diff::InlineDiffMarker.new(new_line).mark(new_diffs).html_safe
+ marked_old_line = Gitlab::Diff::InlineDiffMarker.new(old_line).mark(old_diffs)
+ marked_new_line = Gitlab::Diff::InlineDiffMarker.new(new_line).mark(new_diffs)
[marked_old_line, marked_new_line]
end