Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-08-05 16:40:14 +0300
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-08-05 16:40:14 +0300
commit957e849f41d96fa9778fcdd06792d2f0274b29ab (patch)
treeeb100ece04228262142e6ebfeb1df9b1efb824b2 /app/assets/javascripts/merge_request_widget.js.coffee
parent6b9dbe9f5a175a8162abf296367f561bab3eea1a (diff)
parent1cb8588c662df41a76788759737e5b9ecb2ceba6 (diff)
Merge branch 'drop-satellites'
Diffstat (limited to 'app/assets/javascripts/merge_request_widget.js.coffee')
-rw-r--r--app/assets/javascripts/merge_request_widget.js.coffee2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/assets/javascripts/merge_request_widget.js.coffee b/app/assets/javascripts/merge_request_widget.js.coffee
index 762eec63dee..c68a2a9d047 100644
--- a/app/assets/javascripts/merge_request_widget.js.coffee
+++ b/app/assets/javascripts/merge_request_widget.js.coffee
@@ -19,7 +19,7 @@ class @MergeRequestWidget
when 'merged'
location.reload()
else
- setTimeout(merge_request_widget.mergeInProgress, 3000)
+ setTimeout(merge_request_widget.mergeInProgress, 2000)
dataType: 'json'
getMergeStatus: ->