tangled.org
appview/state/accounts.go
This file has not been changed.
appview/state/login.go
This file has not been changed.
appview/state/router.go
This patch was likely rebased, as context lines do not match.
History
3 rounds
7 comments
1 commit
expand
collapse
expand 2 comments
sometimes jj can handle conflicts that git cannot!
1 commit
expand
collapse
expand 3 comments
@boltless.me here was the fix line, the new round and my force push makes it hard to see: https://tangled.org/tangled.org/core/pulls/944/round/1#appview%2fstate%2frouter.go-N135
just making the switch endpoint unauthed
interdiffs should be working again, the interdiff of round 1 and 0 highlights the fix quite nicely!
the stack LGTM to me @lewis.moe, could you address the conflicts, happy to merge after! have some very minor UI nits, but we can resolve those down the line.
1 commit
expand
collapse
expand 2 comments
Thank you for the contribution! The UI looks pretty good.
From high level, I found some bug when I run this locally.
- login with account A, add account B too (works well)
- then, logout from account A, back to login page and try switch to B
- silently fails and redirected to
/login?return_url=%2Flogin.
Account switching after logout shouldn't fail and we should redirect back to /login instead and avoid recursion.
Oh nice catch! Simple fix, though I'm not a jj wizard so it might take a bit for me to figure out how to properly have it show up here. :p
Fix is live on tangled.wizardry.systems at least
@oppi.li hello the rebase auto-fixed the merge, is that jj working as expected or did I do something wrong