10 lines
405 B
Text
10 lines
405 B
Text
%p
|
|
= sprintf(s_('Notify|Merge request %{merge_request} can no longer be merged due to conflict.'), { merge_request: merge_request_reference_link(@merge_request) }).html_safe
|
|
%p
|
|
= merge_path_description(@merge_request)
|
|
%p
|
|
= sprintf(s_('Author: %{author_name}'), { author_name: sanitize_name(@merge_request.author_name) })
|
|
%p
|
|
= assignees_label(@merge_request)
|
|
%p
|
|
= reviewers_label(@merge_request)
|