mirror of
https://github.com/wahyd4/gitlabhq.git
synced 2026-08-11 21:56:19 +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
30 lines
1.0 KiB
Plaintext
30 lines
1.0 KiB
Plaintext
- if @merge_request.has_ci?
|
|
.mr-widget-heading
|
|
- [:success, :skipped, :canceled, :failed, :running, :pending].each do |status|
|
|
.ci_widget{class: "ci-#{status}", style: "display:none"}
|
|
- if status == :success
|
|
- status = "passed"
|
|
= icon("check-circle")
|
|
- else
|
|
= icon("circle")
|
|
%span CI build #{status}
|
|
for #{@merge_request.last_commit_short_sha}.
|
|
%span.ci-coverage
|
|
= link_to "View build details", ci_build_details_path(@merge_request), :"data-no-turbolink" => "data-no-turbolink"
|
|
|
|
.ci_widget
|
|
= icon("spinner spin")
|
|
Checking CI status for #{@merge_request.last_commit_short_sha}…
|
|
|
|
.ci_widget.ci-not_found{style: "display:none"}
|
|
= icon("times-circle")
|
|
Could not find CI status for #{@merge_request.last_commit_short_sha}.
|
|
|
|
.ci_widget.ci-error{style: "display:none"}
|
|
= icon("times-circle")
|
|
Could not connect to the CI server. Please check your settings and try again.
|
|
|
|
:coffeescript
|
|
$ ->
|
|
merge_request_widget.getCiStatus()
|