diff options
| author | Mike Greiling <mike@pixelcog.com> | 2018-10-09 18:25:53 +0300 |
|---|---|---|
| committer | Fatih Acet <acetfatih@gmail.com> | 2018-10-09 18:25:53 +0300 |
| commit | d76190371c1ab3ab08f11604aa06196c2acd7138 (patch) | |
| tree | 6612104ab5d7910ba84079982ea4ad5388c05865 /app/assets/javascripts/merge_conflicts | |
| parent | b46894b15b6840c1cc8300120e2fd2ccb0dcc97f (diff) | |
Resolve "Harmonize prettier and eslint configs"
Diffstat (limited to 'app/assets/javascripts/merge_conflicts')
| -rw-r--r-- | app/assets/javascripts/merge_conflicts/components/diff_file_editor.js | 2 | ||||
| -rw-r--r-- | app/assets/javascripts/merge_conflicts/merge_conflict_store.js | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/javascripts/merge_conflicts/components/diff_file_editor.js b/app/assets/javascripts/merge_conflicts/components/diff_file_editor.js index 81950515ab4..c1832d034ef 100644 --- a/app/assets/javascripts/merge_conflicts/components/diff_file_editor.js +++ b/app/assets/javascripts/merge_conflicts/components/diff_file_editor.js @@ -1,4 +1,4 @@ -/* eslint-disable comma-dangle, quote-props, no-useless-computed-key, object-shorthand, no-param-reassign, max-len */ +/* eslint-disable no-useless-computed-key, object-shorthand, no-param-reassign */ /* global ace */ import Vue from 'vue'; diff --git a/app/assets/javascripts/merge_conflicts/merge_conflict_store.js b/app/assets/javascripts/merge_conflicts/merge_conflict_store.js index 1501296ac4f..2cd70247bc6 100644 --- a/app/assets/javascripts/merge_conflicts/merge_conflict_store.js +++ b/app/assets/javascripts/merge_conflicts/merge_conflict_store.js @@ -1,4 +1,4 @@ -/* eslint-disable comma-dangle, object-shorthand, no-param-reassign, camelcase, no-nested-ternary, no-continue, max-len */ +/* eslint-disable object-shorthand, no-param-reassign, camelcase, no-nested-ternary, no-continue */ import $ from 'jquery'; import Vue from 'vue'; |