diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-26 18:06:50 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-26 18:06:50 +0300 |
| commit | 68d3f33d5194c446812d09f079749ddf56f95378 (patch) | |
| tree | 9cb521544bf72e420a2986ca2fba512274a020eb /lib/gitlab/diff | |
| parent | 6a4ffad42050949fcf08e78147575734ae99627e (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab/diff')
| -rw-r--r-- | lib/gitlab/diff/inline_diff_marker.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/diff/inline_diff_marker.rb b/lib/gitlab/diff/inline_diff_marker.rb index 1bbde1ffd2a..29dff699ba5 100644 --- a/lib/gitlab/diff/inline_diff_marker.rb +++ b/lib/gitlab/diff/inline_diff_marker.rb @@ -9,7 +9,7 @@ module Gitlab def mark(line_inline_diffs, mode: nil) super(line_inline_diffs) do |text, left:, right:| - %{<span class="#{html_class_names(left, right, mode)}">#{text}</span>} + %{<span class="#{html_class_names(left, right, mode)}">#{text}</span>}.html_safe end end |