summaryrefslogtreecommitdiff
path: root/.eslintrc.yml
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-02-20 12:52:10 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-02-20 12:52:10 +0000
commitdba864470fbcbb6bdd5b94eb510acdce62c962d8 (patch)
treee8ead0b84e7b814f5891d2c8cd3db2d6b635fb64 /.eslintrc.yml
parentb7d29500f28ff59c8898cdf889a40d3da908f162 (diff)
downloadgitlab-ce-dba864470fbcbb6bdd5b94eb510acdce62c962d8.tar.gz
Add latest changes from gitlab-org/gitlab@12-8-stable-ee
Diffstat (limited to '.eslintrc.yml')
-rw-r--r--.eslintrc.yml13
1 files changed, 6 insertions, 7 deletions
diff --git a/.eslintrc.yml b/.eslintrc.yml
index 07542c42891..8d34efc9a6b 100644
--- a/.eslintrc.yml
+++ b/.eslintrc.yml
@@ -10,9 +10,6 @@ globals:
localStorage: false
IS_EE: false
plugins:
- - import
- - "@gitlab/i18n"
- - "@gitlab/vue-i18n"
- no-jquery
settings:
import/resolver:
@@ -51,8 +48,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