From d9ab72d6080f594d0b3cae15f14b3ef2c6c638cb Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Wed, 20 Oct 2021 08:43:02 +0000
Subject: Add latest changes from gitlab-org/gitlab@14-4-stable-ee

---
 .eslintrc.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to '.eslintrc.yml')

diff --git a/.eslintrc.yml b/.eslintrc.yml
index 6b9a1ce62c0..cd3cd82d4e7 100644
--- a/.eslintrc.yml
+++ b/.eslintrc.yml
@@ -88,7 +88,7 @@ rules:
         - pattern: test_fixtures/**
           group: internal
       alphabetize:
-        order: asc
+        order: ignore
 overrides:
   - files:
       - '**/spec/**/*'
@@ -100,6 +100,8 @@ overrides:
       - 'scripts/**/*'
       - '*.config.js'
       - '*.config.*.js'
+      - 'jest_resolver.js'
+      - storybook/config/*.js
     rules:
       '@gitlab/require-i18n-strings': off
       import/no-extraneous-dependencies: off
-- 
cgit v1.2.3