9 lines
311 B
Text
9 lines
311 B
Text
|
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}
|