diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-11-11 03:12:46 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-11-11 03:12:46 +0300 |
| commit | 5eba9c0d33571d25d5e0d1d7bb49a3ddfc95cf02 (patch) | |
| tree | 2c57bbe5471dab9e320aed166c9a97827b0c2691 /jest.config.js | |
| parent | 7b2f94166965e60329129e5a919e2c3d88f23c7a (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'jest.config.js')
| -rw-r--r-- | jest.config.js | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/jest.config.js b/jest.config.js index 00c28dad0e1..96a62b18d8f 100644 --- a/jest.config.js +++ b/jest.config.js @@ -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 = { |