Merge branch 'upstream/develop' into feat/bulk-edit-notifications and resolve conflicts
This commit is contained in:
commit
88a39fe502
41 files changed
+509
-494
No files matched your search
@@ -40,7 +40,7 @@ export const initializeControllers = (services: InitializedServices): Initialize
|
||||
queueController: new QueueController(services.jobQueue),
|
||||
logController: new LogController(services.logger),
|
||||
statusPageController: new StatusPageController(services.statusPageService, services.monitorsRepository, services.settingsService),
|
||||
notificationController: new NotificationController(services.notificationsService),
|
||||
notificationController: new NotificationController(services.notificationsService, services.monitorsRepository),
|
||||
diagnosticController: new DiagnosticController(services.diagnosticService),
|
||||
incidentController: new IncidentController(services.incidentService),
|
||||
};
|
||||
|
||||
Reference in new issue
Block a user