Skip to content

WIP: preview conflicts concept

username-removed-24217 requested to merge bak1an/gitlab-ce:preview_conflicts_mv into master

@JobV

As mentioned within gitlab-org/gitlab-ce#3567 here goes very dirty implementation for showing conflicts count and conflicting files on MR page.

Updated screenshots:

  • Nothing changed when st_conflicts is nil or [] in merge request diff: (this will be empty for old merge requests or in case something goes wrong)

gl_mr_preview_1

  • Link with conflicting files count when st_conflicts is ok:

gl_mr_preview_2

  • Conflict files list after clicking a link, icons suggests conflict type (and there is a tooltip over the icon): gl_mr_preview_3 gl_mr_preview_4

Merge request reports