diff options
| author | Chantal Rollison <crollison@gitlab.com> | 2018-08-11 23:33:15 +0300 |
|---|---|---|
| committer | Jose Vargas <jvargas@gitlab.com> | 2018-08-29 00:36:25 +0300 |
| commit | beb8354b345466bbd8da6b1c7e188736659cf742 (patch) | |
| tree | 1ee42329477291e1642d85e97ba7e0e08b2db482 /lib | |
| parent | b44ccb283f68c10e33ac6c51b695fd0afd70642a (diff) | |
Escaped html characters
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/diff/highlight.rb | 2 | ||||
| -rw-r--r-- | lib/gitlab/diff/line.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/gitlab/diff/highlight.rb b/lib/gitlab/diff/highlight.rb index 5c1baa19b66..1f012043e56 100644 --- a/lib/gitlab/diff/highlight.rb +++ b/lib/gitlab/diff/highlight.rb @@ -37,7 +37,7 @@ module Gitlab end end - diff_line.text = rich_line + diff_line.rich_text = rich_line diff_line end diff --git a/lib/gitlab/diff/line.rb b/lib/gitlab/diff/line.rb index 1faf7770634..633985d5caa 100644 --- a/lib/gitlab/diff/line.rb +++ b/lib/gitlab/diff/line.rb @@ -85,7 +85,7 @@ module Gitlab old_line: old_line, new_line: new_line, text: text, - rich_text: rich_text || text, + rich_text: rich_text || CGI.escapeHTML(text), meta_data: meta_positions } end |