From 46de0366b1cc50e67747a457810a54e679bec151 Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Tue, 17 May 2016 13:59:29 -0500
Subject: [PATCH] Fix concurrent request when updating build log in browser

---
 CHANGELOG                              | 1 +
 app/assets/javascripts/ci/build.coffee | 5 +++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index d26a0bff2e..80b9833edd 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -38,6 +38,7 @@ v 8.8.0
   - Upgrade Sidekiq to 4.1.2
   - Added /health_check endpoint for checking service status
   - Make 'upcoming' filter for milestones work better across projects
+  - Fix concurrent request when updating build log in browser
   - Sanitize repo paths in new project error message
   - Bump mail_room to 0.7.0 to fix stuck IDLE connections
   - Remove future dates from contribution calendar graph.
diff --git a/app/assets/javascripts/ci/build.coffee b/app/assets/javascripts/ci/build.coffee
index fca0c3bae5..d700742e4a 100644
--- a/app/assets/javascripts/ci/build.coffee
+++ b/app/assets/javascripts/ci/build.coffee
@@ -28,12 +28,13 @@ class CiBuild
       #
       CiBuild.interval = setInterval =>
         if window.location.href.split("#").first() is build_url
+          last_state = @state
           $.ajax
             url: build_url + "/trace.json?state=" + encodeURIComponent(@state)
             dataType: "json"
             success: (log) =>
-              @state = log.state
-              if log.status is "running"
+              if last_state is @state and log.status is "running"
+                @state = if log.state then log.state else ""
                 if log.append
                   $('.fa-refresh').before log.html
                 else