summaryrefslogtreecommitdiff
path: root/app/assets
diff options
context:
space:
mode:
authorRobert Speicher <robert@gitlab.com>2015-10-23 14:06:34 +0000
committerRobert Speicher <robert@gitlab.com>2015-10-23 14:06:34 +0000
commit17c60173f6e2a543c7a92cd2a992ef8bc1ea2ee6 (patch)
treef44dffdd8defe2f2756a50f436ad1d4f2cb0e84e /app/assets
parent2b51823017faec1d75852bcd318bd502099d692d (diff)
parent5921a1edf3eacc23ed25f39d052ad4db4aac91e2 (diff)
downloadgitlab-ce-17c60173f6e2a543c7a92cd2a992ef8bc1ea2ee6.tar.gz
Merge branch 'fix-ci-regressions' into 'master'
Fix CI regressions This MR fixes a couple of small CI regressions - Allow developer to manage builds - On CI Admin page show only projects that are present in GitLab - On Runner CI Admin page show only projects that are present in GitLab - Refresh build log only when status changes - Show the oldest builds on top when viewing Builds - it most cases it shows running builds on top - Fix Lint rendering - Fix number of other builds in build widget Fixes #3164 Fixes #3161 Fixes gitlab-org/gitlab-ci#343 See merge request !1679
Diffstat (limited to 'app/assets')
-rw-r--r--app/assets/javascripts/ci/build.coffee2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/assets/javascripts/ci/build.coffee b/app/assets/javascripts/ci/build.coffee
index 93385b32a13..44d5ddb7d95 100644
--- a/app/assets/javascripts/ci/build.coffee
+++ b/app/assets/javascripts/ci/build.coffee
@@ -31,7 +31,7 @@ class CiBuild
$('#build-trace code').html build.trace_html
$('#build-trace code').append '<i class="fa fa-refresh fa-spin"/>'
@checkAutoscroll()
- else
+ else if build.status != build_status
Turbolinks.visit build_url
, 4000