From b471c76bcb3348506c2ec96e212433d473db16c1 Mon Sep 17 00:00:00 2001
From: Jacob Schatz <jacobschatz@Jacobs-MBP.fios-router.home>
Date: Wed, 6 Apr 2016 21:46:12 -0400
Subject: [PATCH] Reset MR opts
---
app/assets/javascripts/merge_request_widget.js.coffee | 8 +++++++-
app/views/projects/merge_requests/widget/_show.html.haml | 2 ++
2 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/app/assets/javascripts/merge_request_widget.js.coffee b/app/assets/javascripts/merge_request_widget.js.coffee
index 7102a0673e9..84a8887fbce 100644
--- a/app/assets/javascripts/merge_request_widget.js.coffee
+++ b/app/assets/javascripts/merge_request_widget.js.coffee
@@ -15,6 +15,8 @@ class @MergeRequestWidget
@pollCIStatus()
notifyPermissions()
+ setOpts: (@opts) ->
+
mergeInProgress: (deleteSourceBranch = false)->
$.ajax
type: 'GET'
@@ -48,7 +50,7 @@ class @MergeRequestWidget
@getCIStatus(true)
@readyForCICheck = false
- ), 5000
+ ), 10000
getCIStatus: (showNotification) ->
_this = @
@@ -61,6 +63,10 @@ class @MergeRequestWidget
@firstCICheck = false
@opts.ci_status = data.status
+ if @opts.ci_status is ''
+ @opts.ci_status = data.status
+ return
+
if data.status isnt @opts.ci_status
@showCIStatus data.status
if data.coverage
diff --git a/app/views/projects/merge_requests/widget/_show.html.haml b/app/views/projects/merge_requests/widget/_show.html.haml
index 2be06aebe6c..92d95358937 100644
--- a/app/views/projects/merge_requests/widget/_show.html.haml
+++ b/app/views/projects/merge_requests/widget/_show.html.haml
@@ -22,4 +22,6 @@
if(typeof merge_request_widget === 'undefined') {
merge_request_widget = new MergeRequestWidget(opts);
+ } else {
+ merge_request_widget.setOpts(opts);
}
--
GitLab