Commit 3140c76a authored by Paul Slaughter's avatar Paul Slaughter

Merge branch '345378-fix-eslint-disable-comment-break-jh-pipeline' into 'master'

Fix eslint disable comment break jh pipeline

See merge request gitlab-org/gitlab!74182
parents 88c26c77 e34b0b7b
......@@ -4,7 +4,8 @@ const baseConfig = require('./jest.config.base');
// TODO: Remove existsSync once jh has added jest.config.js
if (IS_JH && fs.existsSync('./jh/jest.config.js')) {
// eslint-disable-next-line global-require, import/no-unresolved
// We can't be explicit with eslint-disable rules because in JH it'll pass import/no-unresolved
// eslint-disable-next-line
module.exports = require('./jh/jest.config');
} else {
module.exports = {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment