mirror of
https://github.com/wahyd4/gitlabhq.git
synced 2026-08-23 11:36:09 +10:00
Dmitriy Zaporozhets
91836272fe
Improve text of MR merge widget and manual merge modal Modal with manual merge instructions:  Archived:  WIP:  Missing target branch:  Missing source branch:  Nothing to merge:  Checking ability to merge:  Conflicts when allowed to merge:  Conflicts when not allowed to merge:  Mergeable when allowed to merge:  Mergeable when not allowed to merge:  Merge in progress:  Merge failed:  Merged:  Closed:  cc @dzaporozhets @rspeicher See merge request !1120
11 lines
399 B
Plaintext
11 lines
399 B
Plaintext
%h4
|
|
= icon("exclamation-triangle")
|
|
This merge request contains merge conflicts
|
|
|
|
%p
|
|
Please resolve these conflicts or
|
|
- if @merge_request.can_be_merged_by?(current_user)
|
|
#{link_to "merge this request manually", "#modal_merge_info", class: "how_to_merge_link vlink", "data-toggle" => "modal"}.
|
|
- else
|
|
ask someone with write access to this repository to merge this request manually.
|