Merge commit '73b64b89170cb72854a1709186c62ce31f476889' into glitch-soc/merge-upstream
Conflicts:
- `app/javascript/styles/fonts/roboto-mono.scss`:
Upstream updated the linter, which changed a few linter rules.
Some of those changed lines are different in glitch-soc because we use
different paths for the assets.
Applied the same style rules on our version of the file.
- `app/javascript/styles/fonts/roboto.scss`:
Upstream updated the linter, which changed a few linter rules.
Some of those changed lines are different in glitch-soc because we use
different paths for the assets.
Applied the same style rules on our version of the file.
Upgrade to Prettier 3 (#25902)
Merge pull request #2291 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
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)
fix buttons showing inconsistent styles (#25903)
Fix filters not applying to explore tab (#25887)
Add `forward_to_domains` parameter to `POST /api/v1/reports` (#25866)
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)