merge upstream again

2025-04-24 14:23:45 -04:00
parent ac894986f9 7a41cfe28b
commit a4dd19fdd4
167 changed files with 6779 additions and 3952 deletions
@@ -408,9 +408,13 @@ export const ROUTE_DEF = [{
 		name: 'avatarDecorations',
 		component: page(() => import('@/pages/avatar-decorations.vue')),
 	}, {
-		path: '/queue',
-		name: 'queue',
-		component: page(() => import('@/pages/admin/queue.vue')),
+		path: '/federation-job-queue',
+		name: 'federationJobQueue',
+		component: page(() => import('@/pages/admin/federation-job-queue.vue')),
+	}, {
+		path: '/job-queue',
+		name: 'jobQueue',
+		component: page(() => import('@/pages/admin/job-queue.vue')),
 	}, {
 		path: '/files',
 		name: 'files',