VladPolskiy/gitlab-foss
1
0
Fork 0
mirror of https://gitlab.com/gitlab-org/gitlab-foss.git synced 2025-07-21 23:43:41 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

Add latest changes from gitlab-org/gitlab@master

Browse Source
This commit is contained in:
GitLab Bot
2021-11-11 00:12:46 +00:00
parent 7b2f941669
commit 5eba9c0d33
9 changed files with 54 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
jest.config.js
View File

@ -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 = {