Follow-up from "Use a serializer to render diff lines"

Everyone can contribute. Help move this issue forward while earning points, leveling up and collecting rewards.

• Close this issue

Refactor Projects::MergeRequests::ConflictsController to use DiffFileEntity when rendering json if possible. If it is not possible then create a new entity/serializer for Conflict::File.

The following discussion from gitlab-ce!21260 should be addressed:

• @felipe_artur started a discussion: (+1 comment)

  We should open another gitlab-ce~3011693 to cover this.Projects::MergeRequests::ConflictsController is rendering diff file in a different way and not using the default serializer.