gitlab-org--gitlab-foss/app/views/notify/merge_request_unmergeable_e...

%p
  Merge Request #{link_to @merge_request.to_reference, project_merge_request_url(@merge_request.target_project, @merge_request)} can no longer be merged due to conflict.
Notify with email when merge request became unmergeable Display MR unmergeable reasons 2018-05-09 09:49:33 +00:00			`%p`
Notify only when unmergeable due to conflict There is still the edge case when 'no commits' changes to 'conflict' would not trigger notification, which we ignore for now. Calling can_be_merged? can cause exception (e.g. non-UTF8) Ignore those by rescueing. Remove unmergeable_reason as now only conflict is notified Update spec 2018-06-07 14:56:59 +00:00			`Merge Request #{link_to @merge_request.to_reference, project_merge_request_url(@merge_request.target_project, @merge_request)} can no longer be merged due to conflict.`