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

fix: resolve merge conflict with main, fix test failures

Browse Source 
- Merge main (pipelines feature) into branch, resolving conflicts in
  app/api/__init__.py and app/views/__init__.py by keeping all routers
  (onboarding + billing from our branch, pipelines from main)
- Fix migration 018 down_revision to depend on both 017_add_onboarding_fields
  and 017_add_pipelines (Alembic multi-head merge pattern)
- Fix test_auth_module.py: add multi_user_enabled=False to three admin-auth
  tests that call auth() directly without FastAPI DI
- Add missing SETTING_METADATA entries for allow_local_signup and all five
  Stripe config keys (fixes test_all_config_settings_have_metadata)

Co-authored-by: christianlouis <361235+christianlouis@users.noreply.github.com>
This commit is contained in:
copilot-swe-agent[bot]
2026-03-07 15:02:43 +00:00
parent 6f197e69fc
commit b1ce28f804
3 changed files with 61 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
migrations/versions/018_add_local_users_and_billing.py
+2 -2
View File
@@ -1,7 +1,7 @@
"""Add local_users table and billing columns
Revision ID: 018_add_local_users_and_billing
Revises: 017_add_onboarding_fields
Revises: 017_add_onboarding_fields, 017_add_pipelines
Create Date: 2026-03-09
"""
@@ -11,7 +11,7 @@ import sqlalchemy as sa
from alembic import op
revision: str = "018_add_local_users_and_billing"
down_revision: Union[str, None] = "017_add_onboarding_fields"
down_revision: Union[str, tuple] = ("017_add_onboarding_fields", "017_add_pipelines")
depends_on: Union[str, None] = None