blob: e9708a297d7e5619d675ee1d815e51e42afad52a (
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)
|
