Commit 476199e0 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge branch 'add_canceled_ci_status' into 'master'

Add canceled CI status

Fixes https://github.com/gitlabhq/gitlab-ci/issues/564

https://dev.gitlab.org/gitlab/gitlab-ci/issues/169

![Screen_Shot_2015-03-19_at_17.10.08](https://dev.gitlab.org/gitlab/gitlabhq/uploads/87f47d9fd1b1a60e0c5402eedd1a1566/Screen_Shot_2015-03-19_at_17.10.08.png)

See merge request !1729
parents 1fdf4508 19032c03
...@@ -88,6 +88,7 @@ v 7.9.0 (unreleased) ...@@ -88,6 +88,7 @@ v 7.9.0 (unreleased)
- Delete deploy key when last connection to a project is destroyed. - Delete deploy key when last connection to a project is destroyed.
- Fix invalid Atom feeds when using emoji, horizontal rules, or images (Christian Walther) - Fix invalid Atom feeds when using emoji, horizontal rules, or images (Christian Walther)
- Backup of repositories with tar instead of git bundle (only now are git-annex files included in the backup) - Backup of repositories with tar instead of git bundle (only now are git-annex files included in the backup)
- Add canceled status for CI
v 7.8.4 v 7.8.4
- Fix issue_tracker_id substitution in custom issue trackers - Fix issue_tracker_id substitution in custom issue trackers
......
...@@ -110,7 +110,7 @@ class @MergeRequest ...@@ -110,7 +110,7 @@ class @MergeRequest
showCiState: (state) -> showCiState: (state) ->
$('.ci_widget').hide() $('.ci_widget').hide()
allowed_states = ["failed", "running", "pending", "success"] allowed_states = ["failed", "canceled", "running", "pending", "success"]
if state in allowed_states if state in allowed_states
$('.ci_widget.ci-' + state).show() $('.ci_widget.ci-' + state).show()
else else
......
...@@ -155,6 +155,12 @@ ...@@ -155,6 +155,12 @@
background-color: #FAF1F1; background-color: #FAF1F1;
} }
&.ci-canceled {
color: $gl-warning;
border-color: $gl-danger;
background-color: #FAF5F1;
}
&.ci-error { &.ci-error {
color: $gl-danger; color: $gl-danger;
border-color: $gl-danger; border-color: $gl-danger;
......
...@@ -23,6 +23,12 @@ ...@@ -23,6 +23,12 @@
%i.fa.fa-spinner %i.fa.fa-spinner
Checking for CI status for #{@merge_request.last_commit_short_sha} Checking for CI status for #{@merge_request.last_commit_short_sha}
.ci_widget.ci-canceled{style: "display:none"}
%i.fa.fa-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"} .ci_widget.ci-error{style: "display:none"}
%i.fa.fa-times %i.fa.fa-times
%span Cannot connect to the CI server. Please check your settings and try again. %span Cannot connect to the CI server. Please check your settings and try again.
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