summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2015-05-14 13:26:58 +0200
committerDouwe Maan <douwe@gitlab.com>2015-05-14 13:27:22 +0200
commit0b098060cc2d11ec1350ace79dc111972a511990 (patch)
treeec840659cc879e2c500274e0d49e489cc06ffbcc /app
parent910794bae5a91479f41468ebc345db680a33b20e (diff)
downloadgitlab-ce-0b098060cc2d11ec1350ace79dc111972a511990.tar.gz
Spin icon next to "Checking for CI status..."spinner-spin
Diffstat (limited to 'app')
-rw-r--r--app/views/projects/merge_requests/show/_mr_ci.html.haml12
1 files changed, 6 insertions, 6 deletions
diff --git a/app/views/projects/merge_requests/show/_mr_ci.html.haml b/app/views/projects/merge_requests/show/_mr_ci.html.haml
index ffa3f7b0e36..3b1cd53df37 100644
--- a/app/views/projects/merge_requests/show/_mr_ci.html.haml
+++ b/app/views/projects/merge_requests/show/_mr_ci.html.haml
@@ -1,34 +1,34 @@
- if @commits.any?
.ci_widget.ci-success{style: "display:none"}
- %i.fa.fa-check
+ = icon("check")
%span CI build passed
for #{@merge_request.last_commit_short_sha}.
= link_to "View build page", ci_build_details_path(@merge_request), :"data-no-turbolink" => "data-no-turbolink"
.ci_widget.ci-failed{style: "display:none"}
- %i.fa.fa-times
+ = icon("times")
%span CI build failed
for #{@merge_request.last_commit_short_sha}.
= link_to "View build page", ci_build_details_path(@merge_request), :"data-no-turbolink" => "data-no-turbolink"
- [:running, :pending].each do |status|
.ci_widget{class: "ci-#{status}", style: "display:none"}
- %i.fa.fa-clock-o
+ = icon("clock-o")
%span CI build #{status}
for #{@merge_request.last_commit_short_sha}.
= link_to "View build page", ci_build_details_path(@merge_request), :"data-no-turbolink" => "data-no-turbolink"
.ci_widget
- %i.fa.fa-spinner
+ = icon("spinner spin")
Checking for CI status for #{@merge_request.last_commit_short_sha}
.ci_widget.ci-canceled{style: "display:none"}
- %i.fa.fa-times
+ = icon("times")
%span CI build canceled
for #{@merge_request.last_commit_short_sha}.
= link_to "View build page", ci_build_details_path(@merge_request), :"data-no-turbolink" => "data-no-turbolink"
.ci_widget.ci-error{style: "display:none"}
- %i.fa.fa-times
+ = icon("times")
%span Cannot connect to the CI server. Please check your settings and try again.