blob: 412a088718657d0b3594ec54dbcef6ff46f05869 (
plain)
1
2
3
4
5
6
7
8
|
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)
|
