Commit 3e79bb9
authored
fix: add alembic merge migration to resolve multiple heads (#370)
009_wallet_fields and 009_add_archived both descend from
008_encrypt_accounting_pw, causing 'alembic upgrade head' to fail in
deploy.sh with "Multiple head revisions are present". Adds merge migration
010_merge_heads to unify the two branches into a single head.
Also fixes a mypy error in get_owner_endpoint: Starlette 0.36+ requires
TemplateResponse(request, name, context) — request moves out of context dict.1 parent 36b3cc9 commit 3e79bb9
2 files changed
Lines changed: 26 additions & 1 deletion
File tree
- components/backend
- alembic/versions
- src/syfthub
Lines changed: 25 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
623 | 623 | | |
624 | 624 | | |
625 | 625 | | |
| 626 | + | |
626 | 627 | | |
627 | 628 | | |
628 | | - | |
629 | 629 | | |
630 | 630 | | |
631 | 631 | | |
| |||
0 commit comments