synced/infisical
1
0
Fork 0
mirror of https://github.com/Infisical/infisical.git synced 2025-03-28 15:29:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update migration file to latest, remove git markers

Browse Source
This commit is contained in:
Tuan Dang
2024-03-05 08:59:58 -08:00
parent f29dd6effa
commit 327c5e2429
2 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
backend/src/db/migrations/20240223184912_ldap-config.ts → backend/src/db/migrations/20240305165532_ldap-config.ts
View File

4
backend/src/server/routes/index.ts
View File

@ -238,7 +238,6 @@ export const registerRoutes = async (
smtpService
});
<<<<<<< HEAD
const ldapService = ldapConfigServiceFactory({
ldapConfigDAL,
orgDAL,
@ -248,8 +247,6 @@ export const registerRoutes = async (
licenseService
});
const telemetryService = telemetryServiceFactory();
=======
const telemetryService = telemetryServiceFactory({
keyStore,
licenseService
@ -260,7 +257,6 @@ export const registerRoutes = async (
queueService
});
>>>>>>> origin
const tokenService = tokenServiceFactory({ tokenDAL: authTokenDAL, userDAL });
const userService = userServiceFactory({ userDAL });
const loginService = authLoginServiceFactory({ userDAL, smtpService, tokenService });