Skip to content
Snippets Groups Projects
Commit 427b5df2 authored by Kamil Trzcińśki's avatar Kamil Trzcińśki
Browse files

Added support for CI skipped status

parent 88a3cfe1
No related branches found
No related tags found
No related merge requests found
Loading
Loading
@@ -29,6 +29,7 @@ v 7.14.0 (unreleased)
- Disabled autocapitalize and autocorrect on login field (Daryl Chan)
- Mention group and project name in creation, update and deletion notices (Achilleas Pipinellis)
- Remove redis-store TTL monkey patch
- Add support for CI skipped status
 
v 7.13.2
- Fix randomly failed spec
Loading
Loading
Loading
Loading
@@ -36,7 +36,7 @@ class @MergeRequestWidget
 
showCiState: (state) ->
$('.ci_widget').hide()
allowed_states = ["failed", "canceled", "running", "pending", "success", "not_found"]
allowed_states = ["failed", "canceled", "running", "pending", "success", "skipped", "not_found"]
if state in allowed_states
$('.ci_widget.ci-' + state).show()
switch state
Loading
Loading
Loading
Loading
@@ -139,6 +139,11 @@
color: $gl-success;
}
 
&.ci-skipped {
background-color: #eee;
color: #888;
}
&.ci-pending,
&.ci-running {
color: $gl-warning;
Loading
Loading
Loading
Loading
@@ -41,7 +41,7 @@ class CiService < Service
 
# Return string with build status or :error symbol
#
# Allowed states: 'success', 'failed', 'running', 'pending'
# Allowed states: 'success', 'failed', 'running', 'pending', 'skipped'
#
#
# Ex.
Loading
Loading
Loading
Loading
@@ -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
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment