diff options
author | Felipe Artur <felipefac@gmail.com> | 2018-08-16 15:53:33 -0300 |
---|---|---|
committer | Felipe Artur <felipefac@gmail.com> | 2018-08-31 15:32:48 -0300 |
commit | 5bc54ca425866c37f6cdf6448d8ae2dcbabea3bf (patch) | |
tree | df5971d723e3239fe86740d78873522f6667537a /lib/gitlab/diff | |
parent | 472f2d566633df6c1dee1f703b06958b9a0a2cd8 (diff) | |
download | gitlab-ce-5bc54ca425866c37f6cdf6448d8ae2dcbabea3bf.tar.gz |
Use a serializer to render diff lines
Diffstat (limited to 'lib/gitlab/diff')
-rw-r--r-- | lib/gitlab/diff/line.rb | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/lib/gitlab/diff/line.rb b/lib/gitlab/diff/line.rb index 1ab6df0b6ae..5b67cd46c48 100644 --- a/lib/gitlab/diff/line.rb +++ b/lib/gitlab/diff/line.rb @@ -79,16 +79,10 @@ module Gitlab } end + # We have to keep this here since it is still used for conflict resolution + # Conflict::File#as_json renders json diff lines in sections def as_json(opts = nil) - { - line_code: line_code, - type: type, - old_line: old_line, - new_line: new_line, - text: text, - rich_text: rich_text || CGI.escapeHTML(text), - meta_data: meta_positions - } + DiffLineSerializer.new.represent(self) end private |