From b2f2df3b38a5ec5fe96a018309f0caf511f9e1d0 Mon Sep 17 00:00:00 2001 From: Jacob Schatz Date: Thu, 3 Mar 2016 19:19:00 -0500 Subject: Add page reload as a temporary boring solution --- app/assets/javascripts/merge_request_widget.js.coffee | 11 +++++++++-- app/views/projects/merge_requests/widget/_show.html.haml | 2 +- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/app/assets/javascripts/merge_request_widget.js.coffee b/app/assets/javascripts/merge_request_widget.js.coffee index 4e422763543..bebedeca28f 100644 --- a/app/assets/javascripts/merge_request_widget.js.coffee +++ b/app/assets/javascripts/merge_request_widget.js.coffee @@ -11,7 +11,9 @@ class @MergeRequestWidget modal = $('#modal_merge_info').modal(show: false) @getBuildStatus() # clear the build poller - $(document).on 'page:fetch', (e) => clearInterval(@fetchBuildStatusInterval) + $(document) + .off 'page:fetch' + .on 'page:fetch', (e) => clearInterval(@fetchBuildStatusInterval) mergeInProgress: (deleteSourceBranch = false)-> $.ajax @@ -60,7 +62,12 @@ class @MergeRequestWidget if data.status isnt _this.opts.current_status notify("Build #{_this.ciLabelForStatus(data.status)}", _this.opts.ci_message.replace('{{status}}', - _this.ciLabelForStatus(data.status))); + _this.ciLabelForStatus(data.status)), + _this.opts.gitlab_icon) + setTimeout (-> + window.location.reload() + return + ), 2000 _this.opts.current_status = data.status $('.mr-widget-heading i') .removeClass() diff --git a/app/views/projects/merge_requests/widget/_show.html.haml b/app/views/projects/merge_requests/widget/_show.html.haml index ac7daa54ebe..fd45b1b9789 100644 --- a/app/views/projects/merge_requests/widget/_show.html.haml +++ b/app/views/projects/merge_requests/widget/_show.html.haml @@ -13,7 +13,7 @@ url_to_automerge_check: "#{merge_check_namespace_project_merge_request_path(@project.namespace, @project, @merge_request)}", check_enable: #{@merge_request.unchecked? ? "true" : "false"}, url_to_ci_check: "#{ci_status_namespace_project_merge_request_path(@project.namespace, @project, @merge_request)}", - gitlab_icon: #{asset_path "gitlab_logo.png"}, + gitlab_icon: "#{asset_path 'gitlab_logo.png'}", ci_enable: #{@project.ci_service ? "true" : "false"} }; -- cgit v1.2.1