summaryrefslogtreecommitdiff
path: root/.eslintrc.yml
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-02-06 06:08:52 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-02-06 06:08:52 +0000
commitfa478f189009649b115136957e2da30d760fe391 (patch)
tree32933cd0a238da9c942ad2d02c0c56d55cdf03d2 /.eslintrc.yml
parentcfbaef3f1c28cdb9b15615215b87167181cb210f (diff)
downloadgitlab-ce-fa478f189009649b115136957e2da30d760fe391.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to '.eslintrc.yml')
-rw-r--r--.eslintrc.yml10
1 files changed, 4 insertions, 6 deletions
diff --git a/.eslintrc.yml b/.eslintrc.yml
index cacc7d25e66..07542c42891 100644
--- a/.eslintrc.yml
+++ b/.eslintrc.yml
@@ -51,10 +51,8 @@ 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