2018-06-07 14:56:59 +00:00
|
|
|
Merge Request #{@merge_request.to_reference} can no longer be merged due to conflict.
|
2018-05-09 09:49:33 +00:00
|
|
|
|
2020-07-03 09:08:53 +00:00
|
|
|
Merge Request URL: #{project_merge_request_url(@merge_request.target_project, @merge_request)}
|
2018-05-09 09:49:33 +00:00
|
|
|
|
|
|
|
= merge_path_description(@merge_request, 'to')
|
|
|
|
|
2019-01-15 14:22:26 +00:00
|
|
|
Author: #{sanitize_name(@merge_request.author_name)}
|
2019-04-07 18:35:16 +00:00
|
|
|
= assignees_label(@merge_request)
|