diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-03-10 15:07:07 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-03-10 15:07:07 +0300 |
commit | e3624c5be1696597bc6b351f56f1a84c2b13211b (patch) | |
tree | f7478638f22c2dcc7f1d987b8c578508324e4644 /app/assets/javascripts/vue_merge_request_widget | |
parent | 74c7e01089dc2245462723574b102665ef3a6440 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/vue_merge_request_widget')
-rw-r--r-- | app/assets/javascripts/vue_merge_request_widget/mr_widget_options.vue | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/app/assets/javascripts/vue_merge_request_widget/mr_widget_options.vue b/app/assets/javascripts/vue_merge_request_widget/mr_widget_options.vue index 688f6372a4e..cd4d9398899 100644 --- a/app/assets/javascripts/vue_merge_request_widget/mr_widget_options.vue +++ b/app/assets/javascripts/vue_merge_request_widget/mr_widget_options.vue @@ -352,6 +352,8 @@ export default { return Promise.resolve(); }, initPolling() { + if (this.startingPollInterval <= 0) return; + this.pollingInterval = new SmartInterval({ callback: this.checkStatus, startingInterval: this.startingPollInterval, @@ -435,10 +437,10 @@ export default { notify.notifyMe(title, message, this.mr.gitlabLogo); }, resumePolling() { - this.pollingInterval.resume(); + this.pollingInterval?.resume(); }, stopPolling() { - this.pollingInterval.stopTimer(); + this.pollingInterval?.stopTimer(); }, bindEventHubListeners() { eventHub.$on('MRWidgetUpdateRequested', (cb) => { |