diff options
| author | Dmitriy Zaporozhets <dzaporozhets@gitlab.com> | 2015-03-19 17:21:20 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dzaporozhets@gitlab.com> | 2015-03-19 17:21:20 +0000 |
| commit | 476199e0691edd956764ace45264511048fe6eb1 (patch) | |
| tree | 6321d4476361bdcd8cd8bfe3df93daf256f0d3dc /app/assets | |
| parent | 1fdf4508d4ccfe941651023de9bc6b70222e651d (diff) | |
| parent | 19032c03198cc393b8977720a28041b06c203e81 (diff) | |
| download | gitlab-ce-476199e0691edd956764ace45264511048fe6eb1.tar.gz | |
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
See merge request !1729
Diffstat (limited to 'app/assets')
| -rw-r--r-- | app/assets/javascripts/merge_request.js.coffee | 2 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/merge_requests.scss | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/app/assets/javascripts/merge_request.js.coffee b/app/assets/javascripts/merge_request.js.coffee index 1fee9dc1892..10462ac073d 100644 --- a/app/assets/javascripts/merge_request.js.coffee +++ b/app/assets/javascripts/merge_request.js.coffee @@ -110,7 +110,7 @@ class @MergeRequest showCiState: (state) -> $('.ci_widget').hide() - allowed_states = ["failed", "running", "pending", "success"] + allowed_states = ["failed", "canceled", "running", "pending", "success"] if state in allowed_states $('.ci_widget.ci-' + state).show() else diff --git a/app/assets/stylesheets/pages/merge_requests.scss b/app/assets/stylesheets/pages/merge_requests.scss index 394b59b7e4b..d8fe339b7b3 100644 --- a/app/assets/stylesheets/pages/merge_requests.scss +++ b/app/assets/stylesheets/pages/merge_requests.scss @@ -155,6 +155,12 @@ background-color: #FAF1F1; } + &.ci-canceled { + color: $gl-warning; + border-color: $gl-danger; + background-color: #FAF5F1; + } + &.ci-error { color: $gl-danger; border-color: $gl-danger; |