Merge branch 'main' into codex/0.2-gitea-integration/05-ticket-branch-creation-from-ticket-detail

# Conflicts: # resources/js/components/AppSidebar.vue
2026-04-01 20:35:06 +02:00
parent 92dfe3840c 9feeddcd2a
commit 78ae4eca94
48 changed files with 331488 additions and 96 deletions
@@ -22,10 +22,10 @@ import {
    SidebarMenuButton,
    SidebarMenuItem,
 } from '@/components/ui/sidebar';
+import { dashboard } from '@/routes';
 import { index as adminTeams } from '@/routes/admin/teams';
 import { index as adminUsers } from '@/routes/admin/users';
-import { index as projectsIndex } from '@/routes/projects/index';
-import { dashboard } from '@/routes/index';
+import { index as projectsIndex } from '@/routes/projects';
 import type { NavItem } from '@/types';

 const page = usePage();
@@ -98,6 +98,7 @@ watch(
    async (isOpen) => {
        if (!isOpen) {
            resetModalState();
+
            return;
        }