Merge branch 'develop' into backmerge-20231002

2023-10-02 15:57:14 +02:00 · 2023-10-02 15:57:14 +02:00 · 4389ac0445
parent c7c81c348b 5179b6e99a
commit 4389ac0445
2 changed files with 2 additions and 2 deletions
--- a/packages/pro
+++ b/packages/pro
@ -1 +1 @@
-Subproject commit 7040ae5282cc23d7ae56ac1be8a369d1c32aab2f
+Subproject commit 30385682141e5ba9d98de7d71d5be1672109cd15
--- a/packages/worker/src/api/routes/global/tests/scim.spec.ts
+++ b/packages/worker/src/api/routes/global/tests/scim.spec.ts
@ -11,7 +11,7 @@ import { TestConfiguration } from "../../../../tests"
 import { events } from "@budibase/backend-core"

 // this test can 409 - retries reduce issues with this
-jest.retryTimes(2)
+jest.retryTimes(2, { logErrorsBeforeRetry: true })
 jest.setTimeout(30000)

 mocks.licenses.useScimIntegration()