diff options
| author | Mike Greiling <mike@pixelcog.com> | 2016-12-13 21:01:05 -0600 |
|---|---|---|
| committer | Mike Greiling <mike@pixelcog.com> | 2016-12-13 21:07:31 -0600 |
| commit | 23f5865e184c1738df86893d31392faf4bc2bad7 (patch) | |
| tree | 9840b30d7da0eb6ab025dbd53000d93d513e96ed /app/assets/javascripts/merge_conflicts/components/inline_conflict_lines.js.es6 | |
| parent | 75b0627fd4c811d4fae4e85b1e303f2dbcab6786 (diff) | |
| download | gitlab-ce-23f5865e184c1738df86893d31392faf4bc2bad7.tar.gz | |
expand remaining non-explicit eslint-disable blocks and factor out globals when no-undef encountered
Diffstat (limited to 'app/assets/javascripts/merge_conflicts/components/inline_conflict_lines.js.es6')
| -rw-r--r-- | app/assets/javascripts/merge_conflicts/components/inline_conflict_lines.js.es6 | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/app/assets/javascripts/merge_conflicts/components/inline_conflict_lines.js.es6 b/app/assets/javascripts/merge_conflicts/components/inline_conflict_lines.js.es6 index 23c4618af70..74544b7d0c7 100644 --- a/app/assets/javascripts/merge_conflicts/components/inline_conflict_lines.js.es6 +++ b/app/assets/javascripts/merge_conflicts/components/inline_conflict_lines.js.es6 @@ -1,4 +1,6 @@ -/* eslint-disable */ +/* eslint-disable padded-blocks, no-param-reassign, comma-dangle */ +/* global Vue */ + ((global) => { global.mergeConflicts = global.mergeConflicts || {}; |