fix: resolve merge conflicts with main branch

gitea-admin/gh-christianlouis-docuelevate

Merge origin/main into feature branch, resolving 18 conflicts:
- app/api/__init__.py: add classification_rules_router alongside system_reset_router
- app/config.py: keep system reset settings from main
- app/models.py: keep ClassificationRuleModel alongside main's models
- app/utils/settings_service.py: keep factory reset settings from main
- app/views/__init__.py: keep system_reset_router from main
- tests/conftest.py: add ClassificationRuleModel import
- migrations/env.py: add ClassificationRuleModel import
- .env.demo, docs/*, frontend/*, mobile/*: keep additions from main
- BUILD_DATE, GIT_SHA, RUNTIME_INFO, VERSION, CHANGELOG.md: accept main's version

Co-authored-by: christianlouis <361235+christianlouis@users.noreply.github.com>

This commit is contained in:

copilot-swe-agent[bot]

2026-03-17 11:09:39 +00:00

parent bdc26846bd

commit c7d67031d4

33 changed files with 2275 additions and 11 deletions

									
										migrations/env.py
									
		+1
		
												View File
												
				@@ -24,6 +24,7 @@ from app.models import (  # noqa: F401

				    ApplicationSettings,

				    AuditLog,

				    BackupRecord,

				    ClassificationRuleModel,

				    ComplianceTemplate,

				    DocumentMetadata,

				    FileProcessingStep,