Resolve Merge conflicts in editor

What does this MR do?

This is the second iteration of https://gitlab.com/gitlab-org/gitlab-ce/issues/20344 which now allows to resolve conflicts manually providing an editor to the user.

Are there points in the code the reviewer needs to double check?

• Previous implementation has been refactored almost from the ground up.
• Also some components like parallel-conflict-lines has been optimized to work well with PhantomJS.
• The app and files required files are loaded only when needed. merge_conflicts_bundle.js is only loaded in /<group>/<project>/merge_requests/<Id>/conflicts only

Why was this MR needed?

Some MRs were unable to be solved interactively in the UI, with this MR we let the user to manually fix complex merge request conflicts.

Screenshots (if relevant)

Does this MR meet the acceptance criteria?

• CHANGELOG entry added
• Documentation created/updated
• API support added
• Tests
  • Added for this feature/bug
  • All builds are passing
• Conform by the merge request performance guides
• Conform by the style guides
• Branch has no merge conflicts with master (if you do - rebase it please)
• Squashed related commits together

What are the relevant issue numbers?

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/20344, https://gitlab.com/gitlab-org/gitlab-ce/issues/3567.

lib/gitlab/conflict/file.rb

@@ -9,7 +9,7 @@ class MissingResolution < ResolutionError
 
       CONTEXT_LINES = 3
 
-      attr_reader :merge_file_result, :their_path, :our_path, :our_mode, :merge_request, :repository, :type
+      attr_reader :merge_file_result, :their_path, :our_path, :our_mode, :merge_request, :repository
 
       def initialize(merge_file_result, conflict, merge_request:)
         @merge_file_result = merge_file_result
@@ -25,6 +25,12 @@ def content
         merge_file_result[:data]
       end
 
+      def type
+        lines unless @type
+
+        @type.inquiry
+      end
+
       # Array of Gitlab::Diff::Line objects
       def lines
         return @lines if defined?(@lines)
@@ -200,12 +206,14 @@ def as_json(opts = {})
                                                  ::File.join(merge_request.diff_refs.head_sha, our_path))
         }
 
-        if opts[:full_content]
-          json_hash.merge(content: content)
-        else
-          json_hash.merge!(sections: sections) if type == 'text'
-
-          json_hash.merge(type: type, content_path: content_path)
+        json_hash.tap do |json_hash|
+          if opts[:full_content]
+            json_hash[:content] = content
+          else
+            json_hash[:sections] = sections if type.text?
+            json_hash[:type] = type
+            json_hash[:content_path] = content_path
+          end
         end
       end