Commit f668a785 authored by Connor Shea's avatar Connor Shea

Starting work on the warn_on_failure feature for the MR build status.

parent 1d7ac164
...@@ -57,6 +57,8 @@ class @MergeRequestWidget ...@@ -57,6 +57,8 @@ class @MergeRequestWidget
ciLabelForStatus: (status) -> ciLabelForStatus: (status) ->
if status is 'success' if status is 'success'
'passed' 'passed'
else if status is 'success_with_warnings'
'passed with warnings'
else else
status status
...@@ -116,7 +118,7 @@ class @MergeRequestWidget ...@@ -116,7 +118,7 @@ class @MergeRequestWidget
showCIStatus: (state) -> showCIStatus: (state) ->
return if not state? return if not state?
$('.ci_widget').hide() $('.ci_widget').hide()
allowed_states = ["failed", "canceled", "running", "pending", "success", "skipped", "not_found"] allowed_states = ["failed", "canceled", "running", "pending", "success", "success_with_warnings", "skipped", "not_found"]
if state in allowed_states if state in allowed_states
$('.ci_widget.ci-' + state).show() $('.ci_widget.ci-' + state).show()
switch state switch state
...@@ -124,7 +126,7 @@ class @MergeRequestWidget ...@@ -124,7 +126,7 @@ class @MergeRequestWidget
@setMergeButtonClass('btn-danger') @setMergeButtonClass('btn-danger')
when "running" when "running"
@setMergeButtonClass('btn-warning') @setMergeButtonClass('btn-warning')
when "success" when "success", "success_with_warnings"
@setMergeButtonClass('btn-create') @setMergeButtonClass('btn-create')
else else
$('.ci_widget.ci-error').show() $('.ci_widget.ci-error').show()
......
...@@ -68,6 +68,14 @@ ...@@ -68,6 +68,14 @@
color: $gl-success; color: $gl-success;
} }
&.ci-success_with_warnings {
color: $gl-success;
i {
color: $gl-warning;
}
}
&.ci-skipped { &.ci-skipped {
background-color: #eee; background-color: #eee;
color: #888; color: #888;
......
...@@ -15,7 +15,8 @@ ...@@ -15,7 +15,8 @@
border-color: $gl-danger; border-color: $gl-danger;
} }
&.ci-success { &.ci-success,
&.ci-success_with_warnings {
color: $gl-success; color: $gl-success;
border-color: $gl-success; border-color: $gl-success;
} }
...@@ -49,9 +50,12 @@ ...@@ -49,9 +50,12 @@
.ci-status-icon-failed { .ci-status-icon-failed {
color: $gl-danger; color: $gl-danger;
} }
.ci-status-icon-pending {
.ci-status-icon-pending,
.ci-status-icon-success_with_warning {
color: $gl-warning; color: $gl-warning;
} }
.ci-status-icon-running { .ci-status-icon-running {
color: $blue-normal; color: $blue-normal;
} }
......
...@@ -17,6 +17,8 @@ module CiStatusHelper ...@@ -17,6 +17,8 @@ module CiStatusHelper
def ci_label_for_status(status) def ci_label_for_status(status)
if status == 'success' if status == 'success'
'passed' 'passed'
elsif status == 'success_with_warnings'
'passed with warnings'
else else
status status
end end
...@@ -27,6 +29,8 @@ module CiStatusHelper ...@@ -27,6 +29,8 @@ module CiStatusHelper
case status case status
when 'success' when 'success'
'check' 'check'
when 'success_with_warnings'
'exclamation-triangle'
when 'failed' when 'failed'
'close' 'close'
when 'pending' when 'pending'
......
- if @pipeline - if @pipeline
.mr-widget-heading .mr-widget-heading
- %w[success skipped canceled failed running pending].each do |status| - %w[success success_with_warnings skipped canceled failed running pending].each do |status|
.ci_widget{ class: "ci-#{status}", style: ("display:none" unless @pipeline.status == status) } .ci_widget{ class: "ci-#{status}", style: ("display:none" unless @pipeline.status == status) }
= ci_icon_for_status(status) = ci_icon_for_status(status)
%span %span
......
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