diff options
| author | Jacob Schatz <jacobschatz@Jacobs-MBP.fios-router.home> | 2016-03-03 19:40:51 -0500 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2016-03-18 10:26:48 +0000 |
| commit | fcc0f7c68ecdb17c3ee6173515663a7c2854f44c (patch) | |
| tree | 375b482fd3634a2260cac2aeff55182bc0c0556f | |
| parent | b2f2df3b38a5ec5fe96a018309f0caf511f9e1d0 (diff) | |
| download | gitlab-ce-fcc0f7c68ecdb17c3ee6173515663a7c2854f44c.tar.gz | |
Remove repeated build listing
| -rw-r--r-- | app/assets/javascripts/merge_request_widget.js.coffee | 5 | ||||
| -rw-r--r-- | app/views/projects/merge_requests/widget/_show.html.haml | 4 |
2 files changed, 4 insertions, 5 deletions
diff --git a/app/assets/javascripts/merge_request_widget.js.coffee b/app/assets/javascripts/merge_request_widget.js.coffee index bebedeca28f..97198e14248 100644 --- a/app/assets/javascripts/merge_request_widget.js.coffee +++ b/app/assets/javascripts/merge_request_widget.js.coffee @@ -11,9 +11,6 @@ class @MergeRequestWidget modal = $('#modal_merge_info').modal(show: false) @getBuildStatus() # clear the build poller - $(document) - .off 'page:fetch' - .on 'page:fetch', (e) => clearInterval(@fetchBuildStatusInterval) mergeInProgress: (deleteSourceBranch = false)-> $.ajax @@ -65,7 +62,7 @@ class @MergeRequestWidget _this.ciLabelForStatus(data.status)), _this.opts.gitlab_icon) setTimeout (-> - window.location.reload() + Turbolinks.visit(location.href) return ), 2000 _this.opts.current_status = data.status diff --git a/app/views/projects/merge_requests/widget/_show.html.haml b/app/views/projects/merge_requests/widget/_show.html.haml index fd45b1b9789..dbc6d6c3f90 100644 --- a/app/views/projects/merge_requests/widget/_show.html.haml +++ b/app/views/projects/merge_requests/widget/_show.html.haml @@ -27,4 +27,6 @@ opts.ci_message = "Build {{status}} for #{@merge_request.last_commit.sha}"; :javascript - merge_request_widget = new MergeRequestWidget(opts);
\ No newline at end of file + if(typeof merge_request_widget === 'undefined') { + merge_request_widget = new MergeRequestWidget(opts); + }
\ No newline at end of file |