diff options
| author | Stan Hu <stanhu@gmail.com> | 2016-05-04 23:47:36 +0000 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2016-05-04 23:47:36 +0000 |
| commit | bee002270d1c8121c36803649fdaa8b61d55a702 (patch) | |
| tree | 3f4de917741a17a2cae4604d2f2af4043e71f21a /app | |
| parent | 5653a71635b44263efec43060267dc23f486cfa2 (diff) | |
| parent | 0e9c2e721b08e244e63f1d26ac3771a8d858cd76 (diff) | |
| download | gitlab-ce-bee002270d1c8121c36803649fdaa8b61d55a702.tar.gz | |
Merge branch 'fix-team-build-state-in-mr-widget' into 'master'
Merge request widget displays TeamCity build state and code coverage correctly again
## What does this MR do?
This MR contains a fix for a regression introduced in `8.7`. In former version, the TeamCity build status was always displayed correctly. In `8.7` the build state is still checked, but the UI is not updated correctly any longer.
## Are there points in the code the reviewer needs to double check?
The changes are quite simple, so please simply double check them.
## Why was this MR needed?
This MR is needed to make the TeamCity build status working again.
## What are the relevant issue numbers?
#17080
See merge request !3998
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/javascripts/merge_request_widget.js.coffee | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/app/assets/javascripts/merge_request_widget.js.coffee b/app/assets/javascripts/merge_request_widget.js.coffee index 065626beeb8..17a5a057a94 100644 --- a/app/assets/javascripts/merge_request_widget.js.coffee +++ b/app/assets/javascripts/merge_request_widget.js.coffee @@ -68,20 +68,18 @@ class @MergeRequestWidget $.getJSON @opts.ci_status_url, (data) => @readyForCICheck = true - if @firstCICheck - @firstCICheck = false - @opts.ci_status = data.status - - if @opts.ci_status is '' - @opts.ci_status = data.status + if data.status is '' return - if data.status isnt @opts.ci_status and data.status? + if @firstCiCheck || data.status isnt @opts.ci_status and data.status? + @opts.ci_status = data.status @showCIStatus data.status if data.coverage @showCICoverage data.coverage - if showNotification + # The first check should only update the UI, a notification + # should only be displayed on status changes + if showNotification and not @firstCiCheck status = @ciLabelForStatus(data.status) if status is "preparing" @@ -104,8 +102,7 @@ class @MergeRequestWidget @close() Turbolinks.visit _this.opts.builds_path ) - - @opts.ci_status = data.status + @firstCiCheck = false showCIStatus: (state) -> $('.ci_widget').hide() |