diff options
| author | Douwe Maan <douwe@gitlab.com> | 2017-09-14 08:28:04 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2017-09-14 08:28:04 +0000 |
| commit | d3b89a407c1fbfc0011acb8724cef08fd755580b (patch) | |
| tree | a5d1bddd3dcd61592d562693f028d249b1c48f61 /lib | |
| parent | d3fb1da12011b1fcaa3e2fc5c38b6cc87f3d38ab (diff) | |
| parent | 46e4e8f4dc968b7173aa37bb3e3bb944e5d63e10 (diff) | |
| download | gitlab-ce-d3b89a407c1fbfc0011acb8724cef08fd755580b.tar.gz | |
Merge branch '37576-renamed-files-have-escaped-html-for-the-inline-diff-in-the-header' into 'master'
Resolve "Renamed files have escaped HTML for the inline diff in the header"
Closes #37576
See merge request gitlab-org/gitlab-ce!14121
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/diff/inline_diff_marker.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/gitlab/diff/inline_diff_marker.rb b/lib/gitlab/diff/inline_diff_marker.rb index 919965100ae..010b4be7b40 100644 --- a/lib/gitlab/diff/inline_diff_marker.rb +++ b/lib/gitlab/diff/inline_diff_marker.rb @@ -2,9 +2,10 @@ module Gitlab module Diff class InlineDiffMarker < Gitlab::StringRangeMarker def mark(line_inline_diffs, mode: nil) - super(line_inline_diffs) do |text, left:, right:| + mark = super(line_inline_diffs) do |text, left:, right:| %{<span class="#{html_class_names(left, right, mode)}">#{text}</span>} end + mark.html_safe end private |