gitea-admin/gh-christianlouis-docuelevate
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: resolve merge conflicts with main branch

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files
RUNTIME_INFO
+6 -6
View File
@@ -1,10 +1,10 @@
DocuElevate Build Information
==============================
Version: 0.152.0
Build Date: 2026-03-16T21:40:03Z
Git Commit: 793b6d3e2562518cb404579f656e82a6dc60da02
Git Short SHA: 793b6d3
Version: 0.154.0
Build Date: 2026-03-17T09:55:43Z
Git Commit: 7b7554decf527d2c9f7eee653a1f503249b7d138
Git Short SHA: 7b7554d
Git Branch: main
Commit Date: 2026-03-16T22:39:40+01:00
Build Timestamp: 2026-03-16T21:40:03Z
Commit Date: 2026-03-17T10:55:10+01:00
Build Timestamp: 2026-03-17T09:55:43Z
==============================