Merge remote-tracking branch 'origin/2.0.X' into 2.0.X

This commit is contained in:
Louis Lam
2023-09-01 05:23:52 +08:00
22 changed files with 1306 additions and 264 deletions

View File

@@ -84,7 +84,7 @@ log.info("server", "Importing this project modules");
log.debug("server", "Importing Monitor");
const Monitor = require("./model/monitor");
log.debug("server", "Importing Settings");
const { getSettings, setSettings, setting, initJWTSecret, checkLogin, startUnitTest, FBSD, doubleCheckPassword, startE2eTests,
const { getSettings, setSettings, setting, initJWTSecret, checkLogin, FBSD, doubleCheckPassword, startE2eTests,
allowDevAllOrigin
} = require("./util-server");
@@ -1666,10 +1666,6 @@ let needSetup = false;
startMonitors();
checkVersion.startInterval();
if (testMode) {
startUnitTest();
}
if (e2eTestMode) {
startE2eTests();
}