Commit fcc0f7c6 authored by Jacob Schatz's avatar Jacob Schatz Committed by Phil Hughes

Remove repeated build listing

parent b2f2df3b
...@@ -11,9 +11,6 @@ class @MergeRequestWidget ...@@ -11,9 +11,6 @@ class @MergeRequestWidget
modal = $('#modal_merge_info').modal(show: false) modal = $('#modal_merge_info').modal(show: false)
@getBuildStatus() @getBuildStatus()
# clear the build poller # clear the build poller
$(document)
.off 'page:fetch'
.on 'page:fetch', (e) => clearInterval(@fetchBuildStatusInterval)
mergeInProgress: (deleteSourceBranch = false)-> mergeInProgress: (deleteSourceBranch = false)->
$.ajax $.ajax
...@@ -65,7 +62,7 @@ class @MergeRequestWidget ...@@ -65,7 +62,7 @@ class @MergeRequestWidget
_this.ciLabelForStatus(data.status)), _this.ciLabelForStatus(data.status)),
_this.opts.gitlab_icon) _this.opts.gitlab_icon)
setTimeout (-> setTimeout (->
window.location.reload() Turbolinks.visit(location.href)
return return
), 2000 ), 2000
_this.opts.current_status = data.status _this.opts.current_status = data.status
......
...@@ -27,4 +27,6 @@ ...@@ -27,4 +27,6 @@
opts.ci_message = "Build {{status}} for #{@merge_request.last_commit.sha}"; opts.ci_message = "Build {{status}} for #{@merge_request.last_commit.sha}";
:javascript :javascript
if(typeof merge_request_widget === 'undefined') {
merge_request_widget = new MergeRequestWidget(opts); merge_request_widget = new MergeRequestWidget(opts);
}
\ No newline at end of file
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