summaryrefslogtreecommitdiff
path: root/.eslintrc.yml
diff options
context:
space:
mode:
Diffstat (limited to '.eslintrc.yml')
-rw-r--r--.eslintrc.yml10
1 files changed, 6 insertions, 4 deletions
diff --git a/.eslintrc.yml b/.eslintrc.yml
index 07542c42891..cacc7d25e66 100644
--- a/.eslintrc.yml
+++ b/.eslintrc.yml
@@ -51,8 +51,10 @@ rules:
no-jquery/no-serialize: error
promise/always-return: off
promise/no-callback-in-promise: off
+ # Make update to eslint@6 smoother:
+ prefer-object-spread: off
overrides:
- files:
- - '**/spec/**/*'
- rules:
- "@gitlab/i18n/no-non-i18n-strings": off
+ - files:
+ - '**/spec/**/*'
+ rules:
+ "@gitlab/i18n/no-non-i18n-strings": off