summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Greiling <mike@pixelcog.com>2018-11-16 14:48:31 -0600
committerMike Greiling <mike@pixelcog.com>2018-11-20 09:30:02 -0600
commit477741526357163c00d90be180d1240639fc79cf (patch)
treed0ecd4158f1ba108d3f6a2c73315fd52667f370c
parent5b9495c5db851ec8d1ca2cc6da0da12d6b161130 (diff)
downloadgitlab-ce-477741526357163c00d90be180d1240639fc79cf.tar.gz
Disable conflicting eslint rules
-rw-r--r--.eslintrc.yml7
1 files changed, 5 insertions, 2 deletions
diff --git a/.eslintrc.yml b/.eslintrc.yml
index fe0d5f5dce3..bc9d2c570db 100644
--- a/.eslintrc.yml
+++ b/.eslintrc.yml
@@ -29,9 +29,12 @@ rules:
import/no-useless-path-segments: off
lines-between-class-members: off
# Disabled for now, to make the plugin-vue 4.5 -> 5.0 update smoother
- vue/html-closing-bracket-newline: off
- vue/html-closing-bracket-spacing: off
vue/no-confusing-v-for-v-if: error
vue/no-unused-components: off
vue/no-use-v-if-with-v-for: off
vue/no-v-html: off
+ # Disabled due to disagreements with prettier
+ vue/html-closing-bracket-newline: off
+ vue/html-closing-bracket-spacing: off
+ vue/html-indent: off
+ vue/max-attributes-per-line: off