fix: merge main branch and renumber migration 027→037

Resolve 3 merge conflicts and renumber the automation_hooks migration
to follow main's migration chain (036_add_document_translation_fields).

Conflicts resolved:
- app/api/__init__.py: add automation_router alongside main's new routers
- app/utils/settings_service.py: add automation_hooks_enabled alongside compliance_enabled
- tests/conftest.py: add AutomationHook alongside AuditLog/ComplianceTemplate imports

Migration renumbered:
- 027_add_automation_hooks → 037_add_automation_hooks
- down_revision: 026_add_scheduled_jobs → 036_add_document_translation_fields

Co-authored-by: christianlouis <361235+christianlouis@users.noreply.github.com>
This commit is contained in:
copilot-swe-agent[bot]
2026-03-16 22:40:15 +00:00
parent 6a83d51d88
commit 204000aabc
318 changed files with 317516 additions and 2858 deletions
+17
View File
@@ -0,0 +1,17 @@
/**
* Layout for the unauthenticated route group: Welcome → Login.
*
* Uses a headerless native stack so the screens animate naturally.
*/
import { Stack } from "expo-router";
import React from "react";
export default function AuthLayout() {
return (
<Stack screenOptions={{ headerShown: false }}>
<Stack.Screen name="index" />
<Stack.Screen name="login" />
</Stack>
);
}
+4
View File
@@ -0,0 +1,4 @@
/**
* Welcome screen route – first screen shown to unauthenticated users.
*/
export { default } from "../../src/screens/WelcomeScreen";
+4
View File
@@ -0,0 +1,4 @@
/**
* Login screen route – server URL entry and SSO sign-in.
*/
export { default } from "../../src/screens/LoginScreen";