2018-11-08 19:23:39 +05:30
|
|
|
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')
|
|
|
|
|
|
2019-02-15 15:39:39 +05:30
|
|
|
Author: #{sanitize_name(@merge_request.author_name)}
|
|
|
|
|
Assignee: #{sanitize_name(@merge_request.assignee_name)}
|
