summaryrefslogtreecommitdiff
path: root/.eslintrc.yml
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2021-08-18 06:11:01 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2021-08-18 06:11:01 +0000
commit514ace363222f19595375f59b123b5e27c2b9b8a (patch)
tree955d0b886197f5ae104fa29706084dc13061112f /.eslintrc.yml
parent25d4a24f831382d37fabc1b6dd3fde26a6c34d4b (diff)
downloadgitlab-ce-514ace363222f19595375f59b123b5e27c2b9b8a.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to '.eslintrc.yml')
-rw-r--r--.eslintrc.yml2
1 files changed, 1 insertions, 1 deletions
diff --git a/.eslintrc.yml b/.eslintrc.yml
index b6abb574e19..6b9a1ce62c0 100644
--- a/.eslintrc.yml
+++ b/.eslintrc.yml
@@ -3,7 +3,7 @@ extends:
- plugin:@gitlab/i18n
- plugin:no-jquery/slim
- plugin:no-jquery/deprecated-3.4
- - ./tooling/eslint-config/conditionally_ignore_ee.js
+ - ./tooling/eslint-config/conditionally_ignore.js
globals:
__webpack_public_path__: true
gl: false