diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-06 09:08:52 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-06 09:08:52 +0300 |
| commit | fa478f189009649b115136957e2da30d760fe391 (patch) | |
| tree | 32933cd0a238da9c942ad2d02c0c56d55cdf03d2 /app/assets | |
| parent | cfbaef3f1c28cdb9b15615215b87167181cb210f (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets')
3 files changed, 2 insertions, 3 deletions
diff --git a/app/assets/javascripts/due_date_select.js b/app/assets/javascripts/due_date_select.js index 218bf41cd58..b973316b3b9 100644 --- a/app/assets/javascripts/due_date_select.js +++ b/app/assets/javascripts/due_date_select.js @@ -1,4 +1,3 @@ -/* eslint-disable max-classes-per-file */ import $ from 'jquery'; import Pikaday from 'pikaday'; import dateFormat from 'dateformat'; diff --git a/app/assets/javascripts/gl_dropdown.js b/app/assets/javascripts/gl_dropdown.js index 918276ce329..3d5c03440ea 100644 --- a/app/assets/javascripts/gl_dropdown.js +++ b/app/assets/javascripts/gl_dropdown.js @@ -1,4 +1,4 @@ -/* eslint-disable max-classes-per-file, one-var, consistent-return */ +/* eslint-disable one-var, consistent-return */ import $ from 'jquery'; import _ from 'underscore'; 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 9df0c045fe4..75d1e5865b0 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 -= 1; + this.timer = this.timer - 1; if (this.timer === 0) { this.refresh(); |