Skip to content

Update MR merge conflict HTML email to be consistent with text version

charlie ablett requested to merge cablett-merge-request-unmergeable into master

What it says on the tin.

Currently the HTML mail has only one line ("!x can no longer be merged due to conflict") while the text version has a lot more information.

Before

image

After

image

Edited by charlie ablett

Merge request reports