diff options
author | Lukas Eipert <leipert@gitlab.com> | 2018-06-16 16:20:30 +0300 |
---|---|---|
committer | Lukas Eipert <leipert@gitlab.com> | 2018-06-20 15:28:28 +0300 |
commit | 0e6441164f74a76b4b3decd3c0b0d8d31e15c815 (patch) | |
tree | dfd2fcf27f0f0a1016dad23dcc796cb3440f9cc5 /app/assets/javascripts/merge_conflicts | |
parent | a0a05a05f7d4353753852374f0a16a18c62ae843 (diff) |
remove all unused eslint-disable rules
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/components/parallel_conflict_lines.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 e4ed8111824..81950515ab4 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-new, no-param-reassign, max-len */ +/* eslint-disable comma-dangle, quote-props, no-useless-computed-key, object-shorthand, no-param-reassign, max-len */ /* global ace */ import Vue from 'vue'; diff --git a/app/assets/javascripts/merge_conflicts/components/parallel_conflict_lines.js b/app/assets/javascripts/merge_conflicts/components/parallel_conflict_lines.js index 57e73e38d88..69208ac2d36 100644 --- a/app/assets/javascripts/merge_conflicts/components/parallel_conflict_lines.js +++ b/app/assets/javascripts/merge_conflicts/components/parallel_conflict_lines.js @@ -1,4 +1,4 @@ -/* eslint-disable no-param-reassign, comma-dangle */ +/* eslint-disable no-param-reassign */ import Vue from 'vue'; import actionsMixin from '../mixins/line_conflict_actions'; |