fix: resolve conflicts for PR #422

Merge prgs/master into feat/issue-403-workflow-load-boundaries.
Preserve workflow-load boundary rules (#403) alongside master's
audit reconciliation boundary and workspace verification gates.
This commit is contained in:
2026-07-08 11:08:08 -04:00
24 changed files with 2654 additions and 55 deletions
+3
View File
@@ -103,6 +103,7 @@ class PermissionReportBase(unittest.TestCase):
review_workflow_load.clear_review_workflow_load()
self._remotes.stop()
mcp_server._IDENTITY_CACHE.clear()
mcp_server.review_workflow_load.clear_review_workflow_load()
gitea_config._active_profile_override = None
self._dir.cleanup()
@@ -254,6 +255,8 @@ class TestEligibilityDenialReport(PermissionReportBase):
return {"login": "author-user"}
return PR_PAYLOAD
mock_api.side_effect = fake_api
mcp_server.init_review_decision_lock("prgs", "review_pr")
mcp_server.gitea_load_review_workflow()
with patch.dict(os.environ, self._env("author-profile")):
res = mcp_server.gitea_merge_pr(
pr_number=42, confirmation="MERGE PR 42",