Commit 46de0366 authored by Kamil Trzcinski's avatar Kamil Trzcinski

Fix concurrent request when updating build log in browser

parent 16ca3ee6
...@@ -38,6 +38,7 @@ v 8.8.0 ...@@ -38,6 +38,7 @@ v 8.8.0
- Upgrade Sidekiq to 4.1.2 - Upgrade Sidekiq to 4.1.2
- Added /health_check endpoint for checking service status - Added /health_check endpoint for checking service status
- Make 'upcoming' filter for milestones work better across projects - 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 - Sanitize repo paths in new project error message
- Bump mail_room to 0.7.0 to fix stuck IDLE connections - Bump mail_room to 0.7.0 to fix stuck IDLE connections
- Remove future dates from contribution calendar graph. - Remove future dates from contribution calendar graph.
......
...@@ -28,12 +28,13 @@ class CiBuild ...@@ -28,12 +28,13 @@ class CiBuild
# #
CiBuild.interval = setInterval => CiBuild.interval = setInterval =>
if window.location.href.split("#").first() is build_url if window.location.href.split("#").first() is build_url
last_state = @state
$.ajax $.ajax
url: build_url + "/trace.json?state=" + encodeURIComponent(@state) url: build_url + "/trace.json?state=" + encodeURIComponent(@state)
dataType: "json" dataType: "json"
success: (log) => success: (log) =>
@state = log.state if last_state is @state and log.status is "running"
if log.status is "running" @state = if log.state then log.state else ""
if log.append if log.append
$('.fa-refresh').before log.html $('.fa-refresh').before log.html
else else
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment