Add backend for merge conflicts reading

1 files changed, 11 insertions, 0 deletions

diff --git a/lib/gitlab/diff/line.rb b/lib/gitlab/diff/line.rb
index cf097e0d0de..5196051f90d 100644
--- a/lib/gitlab/diff/line.rb
+++ b/lib/gitlab/diff/line.rb
@@ -3,6 +3,7 @@ module Gitlab
     class Line
       attr_reader :type, :index, :old_pos, :new_pos
       attr_accessor :text
+      attr_accessor :rich_text
 
       def initialize(text, type, index, old_pos, new_pos)
         @text, @type, @index = text, type, index
@@ -46,6 +47,16 @@ module Gitlab
       def meta?
         type == 'match' || type == 'nonewline'
       end
+
+      def as_json(opts = nil)
+        {
+          type: type,
+          old_line: old_line,
+          new_line: new_line,
+          text: text,
+          rich_text: rich_text || text
+        }
+      end
     end
   end
 end