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

Add page reload as a temporary boring solution

parent e9c5e312
......@@ -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()
......
......@@ -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"}
};
......
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