diff options
author | Benedikt Huss <benedikt.huss@gmail.com> | 2016-05-04 10:34:25 +0300 |
---|---|---|
committer | Benedikt Huss <benedikt.huss@gmail.com> | 2016-05-05 01:07:56 +0300 |
commit | 655b2640ae9cbe2737369401969e99caeddf192d (patch) | |
tree | ad1df021f590dd7b0770ef4cd1980bf13086ff5b /app | |
parent | 915a4193b433575a63fd4f5048b341d417b06426 (diff) |
Merge request widget displays TeamCity build state and code coverage correctly again
Diffstat (limited to 'app')
-rw-r--r-- | app/assets/javascripts/merge_request_widget.js.coffee | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/app/assets/javascripts/merge_request_widget.js.coffee b/app/assets/javascripts/merge_request_widget.js.coffee index 065626beeb8..1abda3530c4 100644 --- a/app/assets/javascripts/merge_request_widget.js.coffee +++ b/app/assets/javascripts/merge_request_widget.js.coffee @@ -68,13 +68,13 @@ class @MergeRequestWidget $.getJSON @opts.ci_status_url, (data) => @readyForCICheck = true - if @firstCICheck - @firstCICheck = false + if @firstCICheck || @opts.ci_status is '' + if @firstCICheck + @firstCICheck = false @opts.ci_status = data.status - - if @opts.ci_status is '' - @opts.ci_status = data.status - return + @showCIStatus data.status + if data.coverage + @showCICoverage data.coverage if data.status isnt @opts.ci_status and data.status? @showCIStatus data.status |