diff options
| author | Valery Sizov <vsv2711@gmail.com> | 2015-03-19 17:13:20 +0200 |
|---|---|---|
| committer | Valery Sizov <vsv2711@gmail.com> | 2015-03-19 18:27:24 +0200 |
| commit | 19032c03198cc393b8977720a28041b06c203e81 (patch) | |
| tree | c5ed7721b21bf782eabcd385e32343443edb9a7a /app/assets/javascripts | |
| parent | 6c1074e302fd77e87c454cede145dd92f15d0c55 (diff) | |
| download | gitlab-ce-19032c03198cc393b8977720a28041b06c203e81.tar.gz | |
add canceled CI status
Diffstat (limited to 'app/assets/javascripts')
| -rw-r--r-- | app/assets/javascripts/merge_request.js.coffee | 2 |
1 files changed, 1 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 |