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
+1 -1
View File
@@ -969,7 +969,7 @@ class TestConnectionTestEndpoint:
assert resp.status_code == 200
data = resp.json()
assert data["success"] is False
assert "localhost" in data["message"].lower()
assert "internal" in data["message"].lower() or "private" in data["message"].lower()
def test_test_webdav_blocks_file_scheme(self, int_client):
"""WebDAV test blocks file:// scheme."""