Commit 78fba275 authored by Douwe Maan's avatar Douwe Maan

More textual tweaks

parent 7b780237
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
- [:success, :skipped, :canceled, :failed, :running, :pending].each do |status| - [:success, :skipped, :canceled, :failed, :running, :pending].each do |status|
.ci_widget{class: "ci-#{status}", style: "display:none"} .ci_widget{class: "ci-#{status}", style: "display:none"}
- if status == :success - if status == :success
- status = "passed"
= icon("check-circle") = icon("check-circle")
- else - else
= icon("circle") = icon("circle")
...@@ -13,15 +14,15 @@ ...@@ -13,15 +14,15 @@
.ci_widget .ci_widget
= icon("spinner spin") = icon("spinner spin")
Checking CI status for #{@merge_request.last_commit_short_sha} Checking CI status for #{@merge_request.last_commit_short_sha}…
.ci_widget.ci-not_found{style: "display:none"} .ci_widget.ci-not_found{style: "display:none"}
= icon("times-circle") = icon("times-circle")
%span Cannot find status on the CI server for #{@merge_request.last_commit_short_sha}. Could not find CI status for #{@merge_request.last_commit_short_sha}.
.ci_widget.ci-error{style: "display:none"} .ci_widget.ci-error{style: "display:none"}
= icon("times-circle") = icon("times-circle")
%span Cannot connect to the CI server. Please check your settings and try again. Could not connect to the CI server. Please check your settings and try again.
:coffeescript :coffeescript
$ -> $ ->
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
.mr-widget-body .mr-widget-body
%h4 %h4
= icon("spinner spin") = icon("spinner spin")
Merge in progress... Merge in progress…
%p %p
This merge request is in the process of being merged, during which time it is locked and cannot be closed. This merge request is in the process of being merged, during which time it is locked and cannot be closed.
%strong %strong
= icon("spinner spin") = icon("spinner spin")
Checking ability to merge automatically... Checking ability to merge automatically…
:coffeescript :coffeescript
$ -> $ ->
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment