diff options
| author | Connor Shea <connor.james.shea@gmail.com> | 2016-06-29 11:06:41 -0600 |
|---|---|---|
| committer | Connor Shea <connor.james.shea@gmail.com> | 2016-07-19 12:30:28 -0600 |
| commit | f668a785cd7174b32e8070fde9cbb503caa04f8e (patch) | |
| tree | e45cf393ebf2c31ee2f8a4711b3d7108ec059e43 /app/assets/javascripts | |
| parent | 1d7ac1641e50938c854abf249c53e51ce1ef2ed5 (diff) | |
| download | gitlab-ce-f668a785cd7174b32e8070fde9cbb503caa04f8e.tar.gz | |
Starting work on the warn_on_failure feature for the MR build status.
Diffstat (limited to 'app/assets/javascripts')
| -rw-r--r-- | app/assets/javascripts/merge_request_widget.js.coffee | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/app/assets/javascripts/merge_request_widget.js.coffee b/app/assets/javascripts/merge_request_widget.js.coffee index 779f536d9f0..31f5cb93a51 100644 --- a/app/assets/javascripts/merge_request_widget.js.coffee +++ b/app/assets/javascripts/merge_request_widget.js.coffee @@ -57,6 +57,8 @@ class @MergeRequestWidget ciLabelForStatus: (status) -> if status is 'success' 'passed' + else if status is 'success_with_warnings' + 'passed with warnings' else status @@ -116,7 +118,7 @@ class @MergeRequestWidget showCIStatus: (state) -> return if not state? $('.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 $('.ci_widget.ci-' + state).show() switch state @@ -124,7 +126,7 @@ class @MergeRequestWidget @setMergeButtonClass('btn-danger') when "running" @setMergeButtonClass('btn-warning') - when "success" + when "success", "success_with_warnings" @setMergeButtonClass('btn-create') else $('.ci_widget.ci-error').show() |