summaryrefslogtreecommitdiff
path: root/.eslintrc.yml
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-02-06 00:09:12 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-02-06 00:09:12 +0000
commita97acfe57aac7d8206e99e5ffdfe9c5fb5b69544 (patch)
tree2133036f5e917d2d795ddd750f5772d53b957c88 /.eslintrc.yml
parent76623c12c136f43f24c3966ed4b469e2c0b434b7 (diff)
downloadgitlab-ce-a97acfe57aac7d8206e99e5ffdfe9c5fb5b69544.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 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