summaryrefslogtreecommitdiff
path: root/app/views/projects/merge_requests
diff options
context:
space:
mode:
authorKamil Trzcinski <ayufan@ayufan.eu>2015-07-30 13:58:47 +0200
committerKamil Trzcinski <ayufan@ayufan.eu>2015-08-04 16:47:19 +0200
commit427b5df260cffdfcae5caa4662c7fc38631b48a3 (patch)
tree0050e4a7c0793a082d745b5190136254aa32be73 /app/views/projects/merge_requests
parent88a3cfe1070bbd7db450f68b8fc2b509c795e413 (diff)
downloadgitlab-ce-427b5df260cffdfcae5caa4662c7fc38631b48a3.tar.gz
Added support for CI skipped statusci-skipped-status
Diffstat (limited to 'app/views/projects/merge_requests')
-rw-r--r--app/views/projects/merge_requests/widget/_heading.html.haml6
1 files changed, 6 insertions, 0 deletions
diff --git a/app/views/projects/merge_requests/widget/_heading.html.haml b/app/views/projects/merge_requests/widget/_heading.html.haml
index 4cc9c652b61..f04eac0e3bb 100644
--- a/app/views/projects/merge_requests/widget/_heading.html.haml
+++ b/app/views/projects/merge_requests/widget/_heading.html.haml
@@ -6,6 +6,12 @@
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-skipped{style: "display:none"}
+ = icon("check")
+ %span CI build skipped
+ 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"}
= icon("times")
%span CI build failed