summaryrefslogtreecommitdiff
path: root/.eslintrc.yml
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2019-09-24 18:06:05 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2019-09-24 18:06:05 +0000
commit2ed368929ab5094fec5da8038f723463596a80cf (patch)
treeaec98d50349b0e9a490db0099253b801b2d1a9ea /.eslintrc.yml
parentf1a5755898e865428c923587402fd965b601c4ea (diff)
downloadgitlab-ce-2ed368929ab5094fec5da8038f723463596a80cf.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to '.eslintrc.yml')
-rw-r--r--.eslintrc.yml6
1 files changed, 6 insertions, 0 deletions
diff --git a/.eslintrc.yml b/.eslintrc.yml
index 59eec634e8b..524ce64118f 100644
--- a/.eslintrc.yml
+++ b/.eslintrc.yml
@@ -1,5 +1,6 @@
extends:
- '@gitlab'
+ - plugin:promise/recommended
globals:
__webpack_public_path__: true
gl: false
@@ -42,6 +43,11 @@ rules:
no-jquery/no-load: error
no-jquery/no-load-shorthand: error
no-jquery/no-serialize: error
+ promise/always-return: off
+ promise/no-callback-in-promise: off
+ promise/no-nesting: off
+ promise/param-names: off
+ promise/valid-params: off
overrides:
files:
- '**/spec/**/*'