summaryrefslogtreecommitdiff
path: root/jest.config.integration.js
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2022-11-11 19:05:37 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2022-11-11 19:05:37 +0000
commitc2f9f40e8892d316a27702eb5dbcabbe756efd0c (patch)
tree9010111802c50ebcad804e7b2e3f472ca87214ca /jest.config.integration.js
parent5dc5e2c78f8ee966db96ffe31887a90bce650437 (diff)
downloadgitlab-ce-c2f9f40e8892d316a27702eb5dbcabbe756efd0c.tar.gz
Add latest changes from gitlab-org/gitlab@15-5-stable-ee
Diffstat (limited to 'jest.config.integration.js')
-rw-r--r--jest.config.integration.js1
1 files changed, 1 insertions, 0 deletions
diff --git a/jest.config.integration.js b/jest.config.integration.js
index df25c2b247b..e2ce32218e0 100644
--- a/jest.config.integration.js
+++ b/jest.config.integration.js
@@ -25,4 +25,5 @@ module.exports = {
},
}),
timers: 'real',
+ testTimeout: process.env.CI ? 20000 : 7000,
};