diff options
author | Paul Slaughter <pslaughter@gitlab.com> | 2019-03-11 23:18:36 +0300 |
---|---|---|
committer | Paul Slaughter <pslaughter@gitlab.com> | 2019-03-15 06:31:12 +0300 |
commit | d50fe9e49acda211f36a612ee932c583847bda51 (patch) | |
tree | 9e1779f9c6dfe9740ee3cbd3aee69c9129d25e15 /app/assets | |
parent | 8c4d6ea23b013703f0389ff509dee3bb0646f166 (diff) |
Update merge status timeout to 0
- Also stop polling if we get a bad response from the server.
Diffstat (limited to 'app/assets')
-rw-r--r-- | app/assets/javascripts/vue_merge_request_widget/components/states/ready_to_merge.vue | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/app/assets/javascripts/vue_merge_request_widget/components/states/ready_to_merge.vue b/app/assets/javascripts/vue_merge_request_widget/components/states/ready_to_merge.vue index 9b4e80ee3a3..756ce8233fb 100644 --- a/app/assets/javascripts/vue_merge_request_widget/components/states/ready_to_merge.vue +++ b/app/assets/javascripts/vue_merge_request_widget/components/states/ready_to_merge.vue @@ -159,9 +159,12 @@ export default { }); }, initiateMergePolling() { - simplePoll((continuePolling, stopPolling) => { - this.handleMergePolling(continuePolling, stopPolling); - }); + simplePoll( + (continuePolling, stopPolling) => { + this.handleMergePolling(continuePolling, stopPolling); + }, + { timeout: 0 }, + ); }, handleMergePolling(continuePolling, stopPolling) { this.service @@ -192,6 +195,7 @@ export default { }) .catch(() => { new Flash(__('Something went wrong while merging this merge request. Please try again.')); // eslint-disable-line + stopPolling(); }); }, initiateRemoveSourceBranchPolling() { |