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: #{sanitize_name(@merge_request.author_name)}
= assignees_label(@merge_request)
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
Add latest changes from gitlab-org/gitlab@master 2020-07-03 05:08:53 -04:00			`Merge Request URL: #{project_merge_request_url(@merge_request.target_project, @merge_request)}`
Notify with email when merge request became unmergeable Display MR unmergeable reasons 2018-05-09 05:49:33 -04:00
			`= merge_path_description(@merge_request, 'to')`

Use `sanitize_name` to sanitize URL in user full name 2019-01-15 09:22:26 -05:00			`Author: #{sanitize_name(@merge_request.author_name)}`
[CE] Support multiple assignees for merge requests Backports https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/10161 (code out of ee/ folder). 2019-04-07 14:35:16 -04:00			`= assignees_label(@merge_request)`