diff options
| author | Robert Speicher <robert@gitlab.com> | 2015-10-22 07:09:48 +0000 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2015-10-22 09:10:28 +0200 |
| commit | 357e07647fe14f87482c2bd8ceab2d3f5d773f66 (patch) | |
| tree | 7fdd4caf60993fd2dedbab2e0d096697e05781a4 | |
| parent | 8e65f91e6769ef0255212214b4144eb46759803a (diff) | |
| download | gitlab-ce-357e07647fe14f87482c2bd8ceab2d3f5d773f66.tar.gz | |
Merge branch 'fix-build-trace-updating' into 'master'
Fix build trace updating
Fixes #2910
See merge request !1657
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | app/assets/javascripts/ci/build.coffee | 2 | ||||
| -rw-r--r-- | app/views/projects/builds/show.html.haml | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/CHANGELOG b/CHANGELOG index 0fb607264b3..aefc07ecbba 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -22,6 +22,7 @@ v 8.1.0 (unreleased) - Remove CI migration task - Improved performance of finding projects by their namespace - Fix bug where transferring a project would result in stale commit links (Stan Hu) + - Fix build trace updating - Include full path of source and target branch names in New Merge Request page (Stan Hu) - Add user preference to view activities as default dashboard (Stan Hu) - Add option to admin area to sign in as a specific user (Pavel Forkert) diff --git a/app/assets/javascripts/ci/build.coffee b/app/assets/javascripts/ci/build.coffee index c30859b484b..93385b32a13 100644 --- a/app/assets/javascripts/ci/build.coffee +++ b/app/assets/javascripts/ci/build.coffee @@ -22,7 +22,7 @@ class CiBuild # Only valid for runnig build when output changes during time # CiBuild.interval = setInterval => - if window.location.href is build_url + if window.location.href.split("#").first() is build_url $.ajax url: build_url dataType: "json" diff --git a/app/views/projects/builds/show.html.haml b/app/views/projects/builds/show.html.haml index c45bfb27b8f..3a8172dc8e6 100644 --- a/app/views/projects/builds/show.html.haml +++ b/app/views/projects/builds/show.html.haml @@ -175,4 +175,4 @@ :javascript - new CiBuild("#{namespace_project_build_path(@project.namespace, @project, @build)}", "#{@build.status}") + new CiBuild("#{namespace_project_build_url(@project.namespace, @project, @build)}", "#{@build.status}") |