fix: resolve merge conflicts with main branch

gitea-admin/gh-christianlouis-docuelevate

Merge origin/main into feature branch, resolving 3 conflicts:
- app/api/__init__.py: add classification_rules_router alongside new
  routers from main (audit_logs, i18n, mobile, compliance, translation)
- app/models.py: keep ClassificationRuleModel alongside new models from
  main (MobileDevice, ComplianceTemplate, PipelineRoutingRule)
- tests/conftest.py: import both ClassificationRuleModel and new models
  from main (AuditLog, ComplianceTemplate)

Also renumber migration from 027 to 037 to chain from the latest
migration on main (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:33:59 +00:00

parent 23498e0a98

commit 651b48658c

318 changed files with 317516 additions and 2858 deletions

									
										.github/workflows/codeql.yml
									
		+3
		
												View File
												
				@@ -8,6 +8,9 @@ on:

				  schedule:

				    - cron: '37 1 * * 1'

				env:

				  FORCE_JAVASCRIPT_ACTIONS_TO_NODE24: true

				jobs:

				  analyze:

				    name: Analyze (${{ matrix.language }})