fix: merge main branch and renumber migration 027→037

Browse Source

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

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

frontend/translations/af.json

+1753

File diff suppressed because it is too large Load Diff

frontend/translations/am.json

+1753

File diff suppressed because it is too large Load Diff

frontend/translations/ar.json

+1753

File diff suppressed because it is too large Load Diff

frontend/translations/az.json

+1753

File diff suppressed because it is too large Load Diff

frontend/translations/bg.json

+1753

File diff suppressed because it is too large Load Diff

frontend/translations/bn.json

+1753

File diff suppressed because it is too large Load Diff

frontend/translations/ca.json

+1753

File diff suppressed because it is too large Load Diff

frontend/translations/cs.json

+1753

File diff suppressed because it is too large Load Diff

frontend/translations/cy.json

+1753

File diff suppressed because it is too large Load Diff

frontend/translations/da.json

+1753

File diff suppressed because it is too large Load Diff

frontend/translations/de.json

+1753

File diff suppressed because it is too large Load Diff

frontend/translations/dk.json

+1753

File diff suppressed because it is too large Load Diff

frontend/translations/el.json

+1753

File diff suppressed because it is too large Load Diff

frontend/translations/en.json

+1799

File diff suppressed because it is too large Load Diff

frontend/translations/eo.json

+1753

File diff suppressed because it is too large Load Diff

frontend/translations/es.json

+1753

File diff suppressed because it is too large Load Diff

frontend/translations/et.json

+1753

File diff suppressed because it is too large Load Diff

frontend/translations/fa.json

+1753

File diff suppressed because it is too large Load Diff

frontend/translations/fi.json

+1753

File diff suppressed because it is too large Load Diff

frontend/translations/fr.json

+1753

File diff suppressed because it is too large Load Diff

frontend/translations/fy.json

+1753

File diff suppressed because it is too large Load Diff

frontend/translations/ga.json

+1753

File diff suppressed because it is too large Load Diff

frontend/translations/gl.json

+1753

File diff suppressed because it is too large Load Diff

frontend/translations/gu.json

+1753

File diff suppressed because it is too large Load Diff

frontend/translations/ha.json

+1753

File diff suppressed because it is too large Load Diff

frontend/translations/he.json

+1753

File diff suppressed because it is too large Load Diff

frontend/translations/hi.json

+1753

File diff suppressed because it is too large Load Diff

frontend/translations/hr.json

+1753

File diff suppressed because it is too large Load Diff

frontend/translations/hu.json

+1753

File diff suppressed because it is too large Load Diff

frontend/translations/hy.json

+1753

File diff suppressed because it is too large Load Diff

frontend/translations/id.json

+1753

File diff suppressed because it is too large Load Diff

frontend/translations/ig.json

+1753

File diff suppressed because it is too large Load Diff

frontend/translations/is.json

+1753

File diff suppressed because it is too large Load Diff

frontend/translations/it.json

+1753

File diff suppressed because it is too large Load Diff

frontend/translations/ja.json

+1753

File diff suppressed because it is too large Load Diff

frontend/translations/jv.json

+1753

File diff suppressed because it is too large Load Diff

frontend/translations/ka.json

+1753

File diff suppressed because it is too large Load Diff

frontend/translations/kk.json

+1753

File diff suppressed because it is too large Load Diff

frontend/translations/km.json

+1753

File diff suppressed because it is too large Load Diff

frontend/translations/kn.json

+1753

File diff suppressed because it is too large Load Diff

frontend/translations/ko.json

+1753

File diff suppressed because it is too large Load Diff

frontend/translations/lb.json

+1753

File diff suppressed because it is too large Load Diff

frontend/translations/li.json

+1753

File diff suppressed because it is too large Load Diff

frontend/translations/lt.json

+1753

File diff suppressed because it is too large Load Diff

frontend/translations/lv.json

+1753

File diff suppressed because it is too large Load Diff

frontend/translations/ml.json

+1753

File diff suppressed because it is too large Load Diff

frontend/translations/mn.json

+1753

File diff suppressed because it is too large Load Diff

frontend/translations/mr.json

+1753

File diff suppressed because it is too large Load Diff

frontend/translations/ms.json

+1753

File diff suppressed because it is too large Load Diff

frontend/translations/nb.json

+1753

File diff suppressed because it is too large Load Diff

frontend/translations/nds.json

+1753

File diff suppressed because it is too large Load Diff

frontend/translations/ne.json

+1753

File diff suppressed because it is too large Load Diff

frontend/translations/nl.json

+1753

File diff suppressed because it is too large Load Diff

frontend/translations/no.json

+1753

File diff suppressed because it is too large Load Diff

frontend/translations/pa.json

+1753

File diff suppressed because it is too large Load Diff

frontend/translations/pl.json

+1753

File diff suppressed because it is too large Load Diff

frontend/translations/pt-br.json

+1753

File diff suppressed because it is too large Load Diff

frontend/translations/pt.json

+1753

File diff suppressed because it is too large Load Diff

frontend/translations/ro.json

+1753

File diff suppressed because it is too large Load Diff

frontend/translations/si.json

+1753

File diff suppressed because it is too large Load Diff

frontend/translations/sk.json

+1753

File diff suppressed because it is too large Load Diff

frontend/translations/sl.json

+1753

File diff suppressed because it is too large Load Diff

frontend/translations/sr.json

+1753

File diff suppressed because it is too large Load Diff

frontend/translations/sv.json

+1753

File diff suppressed because it is too large Load Diff

frontend/translations/sw.json

+1753

File diff suppressed because it is too large Load Diff

frontend/translations/ta.json

+1753

File diff suppressed because it is too large Load Diff

frontend/translations/te.json

+1753

File diff suppressed because it is too large Load Diff

frontend/translations/th.json

+1753

File diff suppressed because one or more lines are too long

frontend/translations/tl.json

+1753

File diff suppressed because it is too large Load Diff

frontend/translations/tr.json

+1753

File diff suppressed because it is too large Load Diff

frontend/translations/translation_state.json

+136736

File diff suppressed because it is too large Load Diff

frontend/translations/uk.json

+1753

File diff suppressed because it is too large Load Diff

frontend/translations/ur.json

+1753

File diff suppressed because it is too large Load Diff

frontend/translations/uz.json

+1753

File diff suppressed because it is too large Load Diff

frontend/translations/vi.json

+1753

File diff suppressed because it is too large Load Diff

frontend/translations/vls.json

+1753

File diff suppressed because it is too large Load Diff

frontend/translations/yo.json

+1753

File diff suppressed because it is too large Load Diff

frontend/translations/zh-TW.json

+1753

File diff suppressed because it is too large Load Diff

frontend/translations/zh.json

+1753

File diff suppressed because it is too large Load Diff

frontend/translations/zu.json

+1753

File diff suppressed because it is too large Load Diff