WIP: preview conflicts concept
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)
- Link with conflicting files count when
st_conflicts
is ok: