diff options
author | Mike Greiling <mike@pixelcog.com> | 2017-01-11 02:02:20 +0300 |
---|---|---|
committer | Mike Greiling <mike@pixelcog.com> | 2017-01-19 02:16:41 +0300 |
commit | ccada28f30326262b61638edf77b7ab163ff59a0 (patch) | |
tree | 0cc73dc1d9d93521ccbcf1830bc51424799cb3fa /app/assets/javascripts/merge_conflicts/merge_conflict_store.js.es6 | |
parent | e7b5945c591bcd55911f495635f2f852946bd228 (diff) |
resolve all padded-blocks eslint violations
Diffstat (limited to 'app/assets/javascripts/merge_conflicts/merge_conflict_store.js.es6')
-rw-r--r-- | app/assets/javascripts/merge_conflicts/merge_conflict_store.js.es6 | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/app/assets/javascripts/merge_conflicts/merge_conflict_store.js.es6 b/app/assets/javascripts/merge_conflicts/merge_conflict_store.js.es6 index cc256af37f0..c9ce76af3d8 100644 --- a/app/assets/javascripts/merge_conflicts/merge_conflict_store.js.es6 +++ b/app/assets/javascripts/merge_conflicts/merge_conflict_store.js.es6 @@ -1,4 +1,4 @@ -/* eslint-disable comma-dangle, object-shorthand, no-dupe-keys, no-param-reassign, camelcase, prefer-const, no-nested-ternary, no-continue, func-call-spacing, no-spaced-func, padded-blocks, max-len */ +/* eslint-disable comma-dangle, object-shorthand, no-dupe-keys, no-param-reassign, camelcase, prefer-const, no-nested-ternary, no-continue, func-call-spacing, no-spaced-func, max-len */ /* global Cookies */ /* global Vue */ @@ -337,7 +337,6 @@ } } } else if (file.resolveMode === EDIT_RESOLVE_MODE) { - // Unlikely to happen since switching to Edit mode saves content automatically. // Checking anyway in case the save strategy changes in the future if (!file.content) { @@ -374,7 +373,6 @@ }; if (file.type === CONFLICT_TYPES.TEXT) { - // Submit only one data for type of editing if (file.resolveMode === INTERACTIVE_RESOLVE_MODE) { addFile.sections = file.resolutionData; @@ -435,5 +433,4 @@ return this.state.conflictsData.files.some(f => f.type === CONFLICT_TYPES.TEXT); } }; - })(window.gl || (window.gl = {})); |