blob: 3db5f21e6c26d7e21d080d81db533cc79d3ab958 (
plain)
1
2
3
4
5
6
7
8
9
|
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)
= reviewers_label(@merge_request)
|
