From a97acfe57aac7d8206e99e5ffdfe9c5fb5b69544 Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Thu, 6 Feb 2020 00:09:12 +0000
Subject: Add latest changes from gitlab-org/gitlab@master

---
 .../components/states/mr_widget_failed_to_merge.vue                     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'app/assets/javascripts/vue_merge_request_widget/components')

diff --git a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_failed_to_merge.vue b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_failed_to_merge.vue
index 75d1e5865b0..9df0c045fe4 100644
--- a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_failed_to_merge.vue
+++ b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_failed_to_merge.vue
@@ -61,7 +61,7 @@ export default {
       eventHub.$emit('EnablePolling');
     },
     updateTimer() {
-      this.timer = this.timer - 1;
+      this.timer -= 1;
 
       if (this.timer === 0) {
         this.refresh();
-- 
cgit v1.2.3