gitlab-org--gitlab-foss/app/views/notify/merge_request_unmergeable_email.text.haml

Merge Request #{@merge_request.to_reference} can no longer be merged due to conflict.

Merge Request url: #{project_merge_request_url(@merge_request.target_project, @merge_request)}

= merge_path_description(@merge_request, 'to')

Author: #{@merge_request.author_name}
Assignee: #{@merge_request.assignee_name}
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 10:56:59 -04:00			`Merge Request #{@merge_request.to_reference} can no longer be merged due to conflict.`
Notify with email when merge request became unmergeable Display MR unmergeable reasons 2018-05-09 05:49:33 -04:00
			`Merge Request url: #{project_merge_request_url(@merge_request.target_project, @merge_request)}`

			`= merge_path_description(@merge_request, 'to')`

			`Author: #{@merge_request.author_name}`
			`Assignee: #{@merge_request.assignee_name}`