diff options
author | Mike Greiling <mike@pixelcog.com> | 2017-01-10 17:54:56 -0500 |
---|---|---|
committer | Mike Greiling <mike@pixelcog.com> | 2017-01-18 17:15:27 -0600 |
commit | e7b5945c591bcd55911f495635f2f852946bd228 (patch) | |
tree | fe9aab0029921dafd1f5a4f136256bae3f702f0f /app/assets/javascripts/merge_request_widget.js.es6 | |
parent | 9e4d04913ab9267d4a59df4d7feafd97b8117fe7 (diff) | |
download | gitlab-ce-e7b5945c591bcd55911f495635f2f852946bd228.tar.gz |
resolve all semi and no-extra-semi eslint violations
Diffstat (limited to 'app/assets/javascripts/merge_request_widget.js.es6')
-rw-r--r-- | app/assets/javascripts/merge_request_widget.js.es6 | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/assets/javascripts/merge_request_widget.js.es6 b/app/assets/javascripts/merge_request_widget.js.es6 index 26b326e1347..30bf041897a 100644 --- a/app/assets/javascripts/merge_request_widget.js.es6 +++ b/app/assets/javascripts/merge_request_widget.js.es6 @@ -1,4 +1,4 @@ -/* eslint-disable max-len, no-var, func-names, space-before-function-paren, vars-on-top, comma-dangle, no-return-assign, consistent-return, no-param-reassign, one-var, one-var-declaration-per-line, quotes, prefer-template, no-else-return, prefer-arrow-callback, no-unused-vars, no-underscore-dangle, no-shadow, no-mixed-operators, template-curly-spacing, camelcase, default-case, wrap-iife, semi, padded-blocks */ +/* eslint-disable max-len, no-var, func-names, space-before-function-paren, vars-on-top, comma-dangle, no-return-assign, consistent-return, no-param-reassign, one-var, one-var-declaration-per-line, quotes, prefer-template, no-else-return, prefer-arrow-callback, no-unused-vars, no-underscore-dangle, no-shadow, no-mixed-operators, template-curly-spacing, camelcase, default-case, wrap-iife, padded-blocks */ /* global notify */ /* global notifyPermissions */ /* global merge_request_widget */ @@ -90,7 +90,7 @@ const $ciSuccessIcon = $('.js-success-icon'); this.$ciSuccessIcon = $ciSuccessIcon.html(); $ciSuccessIcon.remove(); - } + }; MergeRequestWidget.prototype.mergeInProgress = function(deleteSourceBranch) { if (deleteSourceBranch == null) { @@ -205,7 +205,7 @@ } environment.ci_success_icon = this.$ciSuccessIcon; const templateString = _.unescape($template[0].outerHTML); - const template = _.template(templateString)(environment) + const template = _.template(templateString)(environment); this.$widgetBody.before(template); } }; |