diff options
| author | Mike Greiling <mike@pixelcog.com> | 2017-01-11 23:27:41 -0500 |
|---|---|---|
| committer | Mike Greiling <mike@pixelcog.com> | 2017-01-18 17:18:40 -0600 |
| commit | 04eff5fdb07a78a1980722bd9d5a63360a423e8a (patch) | |
| tree | cc0c135cbf6152e4c3904c559b44859ce60522e3 /app/assets/javascripts/merge_conflicts | |
| parent | 96931b1748a8f9daac697d624029a7473ad258a2 (diff) | |
| download | gitlab-ce-04eff5fdb07a78a1980722bd9d5a63360a423e8a.tar.gz | |
resolve all x-spacing and no-spaced-x eslint violations
Diffstat (limited to 'app/assets/javascripts/merge_conflicts')
| -rw-r--r-- | app/assets/javascripts/merge_conflicts/merge_conflict_store.js.es6 | 4 |
1 files changed, 2 insertions, 2 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 c9ce76af3d8..c8602003d73 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, max-len */ +/* eslint-disable comma-dangle, object-shorthand, no-dupe-keys, no-param-reassign, camelcase, prefer-const, no-nested-ternary, no-continue, max-len */ /* global Cookies */ /* global Vue */ @@ -121,7 +121,7 @@ } else { const lineType = type || 'context'; - linesObj.left.push (this.getLineForParallelView(line, id, lineType)); + linesObj.left.push(this.getLineForParallelView(line, id, lineType)); linesObj.right.push(this.getLineForParallelView(line, id, lineType, true)); } }); |