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

fix: merge main into feature branch - resolve all 18 conflicts cleanly

Browse Source 
Merges origin/main (v0.155.0) into the classification feature branch,
resolving all 18 conflicted files by accepting main's version and
re-applying only classification-specific additions:

- Renumber migration from 037 to 038 (chains from 037_user_sessions)
- Re-add ClassificationRuleModel to models.py, env.py, conftest.py
- Re-add classification_rules_router to api/__init__.py
- All session management, QR auth, and devices code preserved from main

Migration chain validated. 62 classification tests pass.

Co-authored-by: christianlouis <361235+christianlouis@users.noreply.github.com>
This commit is contained in:
copilot-swe-agent[bot]
2026-03-17 13:22:28 +00:00
parent 7e1ed14ee6
commit 342e2d1614
34 changed files with 3265 additions and 38 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.154.0
Build Date: 2026-03-17T09:55:43Z
Git Commit: 7b7554decf527d2c9f7eee653a1f503249b7d138
Git Short SHA: 7b7554d
Version: 0.155.0
Build Date: 2026-03-17T11:23:05Z
Git Commit: 30c2e9afefc57c8d1e19548afec7475f5a838f24
Git Short SHA: 30c2e9a
Git Branch: main
Commit Date: 2026-03-17T10:55:10+01:00
Build Timestamp: 2026-03-17T09:55:43Z
Commit Date: 2026-03-17T12:22:07+01:00
Build Timestamp: 2026-03-17T11:23:05Z
==============================