summaryrefslogtreecommitdiff
path: root/.eslintrc.yml
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-05-20 14:34:42 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-05-20 14:34:42 +0000
commit9f46488805e86b1bc341ea1620b866016c2ce5ed (patch)
treef9748c7e287041e37d6da49e0a29c9511dc34768 /.eslintrc.yml
parentdfc92d081ea0332d69c8aca2f0e745cb48ae5e6d (diff)
downloadgitlab-ce-9f46488805e86b1bc341ea1620b866016c2ce5ed.tar.gz
Add latest changes from gitlab-org/gitlab@13-0-stable-ee
Diffstat (limited to '.eslintrc.yml')
-rw-r--r--.eslintrc.yml11
1 files changed, 4 insertions, 7 deletions
diff --git a/.eslintrc.yml b/.eslintrc.yml
index 0639228fe51..f8bc2a3ae94 100644
--- a/.eslintrc.yml
+++ b/.eslintrc.yml
@@ -22,17 +22,16 @@ rules:
- allow:
- __
- _links
- # Disabled for now, to make the airbnb-base 12.1.0 -> 13.1.0 update smoother
- no-else-return:
- - error
- - allowElseIf: true
import/no-unresolved:
- error
- ignore:
# https://gitlab.com/gitlab-org/gitlab/issues/38226
- '^ee_component/'
- import/no-useless-path-segments: off
import/order: off
+ # Disabled for now, to make the airbnb-base 12.1.0 -> 13.1.0 update smoother
+ no-else-return:
+ - error
+ - allowElseIf: true
lines-between-class-members: off
# Disabled for now, to make the plugin-vue 4.5 -> 5.0 update smoother
vue/no-confusing-v-for-v-if: error
@@ -45,8 +44,6 @@ 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/**/*'