diff options
| author | Kamil Trzcinski <ayufan@ayufan.eu> | 2015-07-30 13:58:47 +0200 |
|---|---|---|
| committer | Kamil Trzcinski <ayufan@ayufan.eu> | 2015-08-04 16:47:19 +0200 |
| commit | 427b5df260cffdfcae5caa4662c7fc38631b48a3 (patch) | |
| tree | 0050e4a7c0793a082d745b5190136254aa32be73 /app/assets | |
| parent | 88a3cfe1070bbd7db450f68b8fc2b509c795e413 (diff) | |
| download | gitlab-ce-427b5df260cffdfcae5caa4662c7fc38631b48a3.tar.gz | |
Added support for CI skipped statusci-skipped-status
Diffstat (limited to 'app/assets')
| -rw-r--r-- | app/assets/javascripts/merge_request_widget.js.coffee | 2 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/merge_requests.scss | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/app/assets/javascripts/merge_request_widget.js.coffee b/app/assets/javascripts/merge_request_widget.js.coffee index e4d815bb4e4..762eec63dee 100644 --- a/app/assets/javascripts/merge_request_widget.js.coffee +++ b/app/assets/javascripts/merge_request_widget.js.coffee @@ -36,7 +36,7 @@ class @MergeRequestWidget showCiState: (state) -> $('.ci_widget').hide() - allowed_states = ["failed", "canceled", "running", "pending", "success", "not_found"] + allowed_states = ["failed", "canceled", "running", "pending", "success", "skipped", "not_found"] if state in allowed_states $('.ci_widget.ci-' + state).show() switch state diff --git a/app/assets/stylesheets/pages/merge_requests.scss b/app/assets/stylesheets/pages/merge_requests.scss index 61071320973..6185dabd39b 100644 --- a/app/assets/stylesheets/pages/merge_requests.scss +++ b/app/assets/stylesheets/pages/merge_requests.scss @@ -139,6 +139,11 @@ color: $gl-success; } + &.ci-skipped { + background-color: #eee; + color: #888; + } + &.ci-pending, &.ci-running { color: $gl-warning; |