summaryrefslogtreecommitdiff
path: root/app/views/projects/builds/show.html.haml
diff options
context:
space:
mode:
authorJacob Schatz <jschatz@gitlab.com>2016-07-06 21:04:27 +0000
committerJacob Schatz <jschatz@gitlab.com>2016-07-06 21:04:27 +0000
commitc66a7b0e949d384448fc1097bf8c1af1d6b7324d (patch)
tree3b597cdd81650754ec264e167d2b5375cb0e2b89 /app/views/projects/builds/show.html.haml
parente33b215ee3a7b048148230c3f770caa411e530aa (diff)
parent2044af6ced27a28f87cf05ca6f2b0f7cb41031df (diff)
downloadgitlab-ce-c66a7b0e949d384448fc1097bf8c1af1d6b7324d.tar.gz
Merge branch 'build-auto-refresh' into 'master'
Fixed issue with build auto-refresh not working ## What does this MR do? Due to the `.json` at the end of the build URL fetch, the page wont correctly auto-reload the build log. This fixes that. See merge request !5110
Diffstat (limited to 'app/views/projects/builds/show.html.haml')
-rw-r--r--app/views/projects/builds/show.html.haml2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/projects/builds/show.html.haml b/app/views/projects/builds/show.html.haml
index d1c468c4692..4e801cc72fe 100644
--- a/app/views/projects/builds/show.html.haml
+++ b/app/views/projects/builds/show.html.haml
@@ -67,4 +67,4 @@
= render "sidebar"
:javascript
- new CiBuild("#{namespace_project_build_url(@project.namespace, @project, @build, :json)}", "#{@build.status}", "#{trace_with_state[:state]}")
+ new CiBuild("#{namespace_project_build_url(@project.namespace, @project, @build)}", "#{namespace_project_build_url(@project.namespace, @project, @build, :json)}", "#{@build.status}", "#{trace_with_state[:state]}")