Add latest changes from gitlab-org/gitlab@14-2-stable-eev14.2.0-rc42

2 files changed, 19 insertions, 5 deletions

diff --git a/tooling/eslint-config/conditionally_ignore.js b/tooling/eslint-config/conditionally_ignore.js
new file mode 100644
index 00000000000..6132c1f52f4
--- /dev/null
+++ b/tooling/eslint-config/conditionally_ignore.js
@@ -0,0 +1,19 @@
+/* eslint-disable import/no-commonjs */
+
+const IS_EE = require('../../config/helpers/is_ee_env');
+const IS_JH = require('../../config/helpers/is_jh_env');
+
+const allPatterns = [
+  {
+    ignore: !IS_EE,
+    pattern: 'ee/**/*.*',
+  },
+  {
+    ignore: !IS_JH,
+    pattern: 'jh/**/*.*',
+  },
+];
+
+const ignorePatterns = allPatterns.filter((x) => x.ignore).map((x) => x.pattern);
+
+module.exports = { ignorePatterns };
diff --git a/tooling/eslint-config/conditionally_ignore_ee.js b/tooling/eslint-config/conditionally_ignore_ee.js
deleted file mode 100644
index e5e3c8013f4..00000000000
--- a/tooling/eslint-config/conditionally_ignore_ee.js
+++ /dev/null
@@ -1,5 +0,0 @@
-/* eslint-disable import/no-commonjs */
-
-const IS_EE = require('../../config/helpers/is_ee_env');
-
-module.exports = IS_EE ? {} : { ignorePatterns: ['ee/**/*.*'] };