diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-06 00:09:12 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-06 00:09:12 +0000 |
| commit | a97acfe57aac7d8206e99e5ffdfe9c5fb5b69544 (patch) | |
| tree | 2133036f5e917d2d795ddd750f5772d53b957c88 /app/assets/javascripts/vue_merge_request_widget | |
| parent | 76623c12c136f43f24c3966ed4b469e2c0b434b7 (diff) | |
| download | gitlab-ce-a97acfe57aac7d8206e99e5ffdfe9c5fb5b69544.tar.gz | |
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/components/states/mr_widget_failed_to_merge.vue | 2 |
1 files changed, 1 insertions, 1 deletions
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(); |