Merge commit '41a505513fb36f7c28c8d8a4270d5ee192169462' into glitch-soc/merge-upstream
Conflicts:
- `app/serializers/initial_state_serializer.rb`:
Upstream renamed an initial state parameter, where we had extra ones.
Renamed as upstream did.
- `app/workers/feed_insert_worker.rb`:
Upstream wrapped database query in a block, we had extra database
queries because of the DM timeline.
Moved everything in the block.
Fix import order inconsistencies (#2289)
Add toast with option to open post after publishing in web UI (#25564)
Fix dropdowns being disabled for logged out users in web UI (#25714)
Fix explore page being inaccessible when opted-out of trends in web UI (#25716)
Convert `<DismissableBanner>` to Typescript (#25582)
Rewrite `<ShortNumber />` as FC and TS (#25492)
simplify counters (#25541)
Merge pull request #2272 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Merge branch 'main' into glitch-soc/merge-upstream
Add canonical link tags in web UI (#25715)
Fix local live feeds does not expand (#25694)
Change labels of live feeds tabs in web UI (#25683)
Merge pull request #2263 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Merge branch 'main' into glitch-soc/merge-upstream
Prevent duplicate concurrent calls of `/api/*/instance` in web UI (#25663)
Change dropdown icon above compose form from ellipsis to bars in web UI (#25661)
Change local and federated timelines to be in a single firehose column (#25641)
Fix onboarding prompt being displayed because of disconnection gaps (#25617)