Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Tatuya Kamada
gitlab-ce
Commits
46de0366
Commit
46de0366
authored
May 17, 2016
by
Kamil Trzcinski
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix concurrent request when updating build log in browser
parent
16ca3ee6
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
2 deletions
+4
-2
CHANGELOG
CHANGELOG
+1
-0
app/assets/javascripts/ci/build.coffee
app/assets/javascripts/ci/build.coffee
+3
-2
No files found.
CHANGELOG
View file @
46de0366
...
@@ -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.
...
...
app/assets/javascripts/ci/build.coffee
View file @
46de0366
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment