summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLukas Eipert <leipert@gitlab.com>2018-05-28 11:21:43 +0200
committerLukas Eipert <leipert@gitlab.com>2018-05-29 18:42:09 +0200
commit76082ce9aa2578d755bfc84c3f4e03f914f68d02 (patch)
tree0ccdd2f8ae064322c8344c28b0895ddeaca36630
parenta626675a3738283c2c399cd93b6d4d10a821be6d (diff)
downloadgitlab-ce-76082ce9aa2578d755bfc84c3f4e03f914f68d02.tar.gz
disable rules that might be conflicting with prettier
-rw-r--r--.eslintrc.yml12
1 files changed, 7 insertions, 5 deletions
diff --git a/.eslintrc.yml b/.eslintrc.yml
index 7950d297416..cef538a249d 100644
--- a/.eslintrc.yml
+++ b/.eslintrc.yml
@@ -38,7 +38,7 @@ rules:
- allow:
- __
- _links
- no-mixed-operators: 0
+ no-mixed-operators: off
vue/html-self-closing:
- error
- html:
@@ -48,7 +48,9 @@ rules:
svg: always
math: always
## Conflicting rules with prettier:
- space-before-function-paren: 0
- curly: 0
- arrow-parens: 0
- function-paren-newline: 0
+ space-before-function-paren: off
+ curly: off
+ arrow-parens: off
+ function-paren-newline: off
+ object-curly-newline: off
+ padded-blocks: off