summaryrefslogtreecommitdiff
path: root/.eslintrc.yml
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-02-18 09:09:24 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-02-18 09:09:24 +0000
commit4720b569f0fcbb47e9f1a60e95172ae63b6f065a (patch)
tree5c6bcecbca227e608753a57a9aad19ccfe0567b6 /.eslintrc.yml
parentcefe554b7ce2d0b52f9de855be832a47c2bc24ab (diff)
downloadgitlab-ce-4720b569f0fcbb47e9f1a60e95172ae63b6f065a.tar.gz
Add latest changes from gitlab-org/gitlab@master
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 ff59dbe0a81..8d34efc9a6b 100644
--- a/.eslintrc.yml
+++ b/.eslintrc.yml
@@ -48,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