blob: dcdd6db69d6dd45ce37a91aaf4356c8c5a82e32d (
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: #{@merge_request.author_name}
Assignee: #{@merge_request.assignee_name}
|