Merge commit '752d49eefef48262d501ba5fc2006d2c8466a000' into glitch-soc/merge-upstream

Conflicts:
- `app/lib/feed_manager.rb`:
  Upstream changed how notifications from follow subscriptions were handled,
  refactoring this file in the process.
  Conflict is due to glitch-soc having an extra timeline type (direct).
  Ported upstream's changes.
- `app/workers/feed_insert_worker.rb`:
  Ditto.
This commit is contained in:
Claire committed 2024-12-02 21:08:15 +01:00
commit c2817c7fad
133 files changed
+595 -580

No files matched your search

@@ -174,7 +174,7 @@ export const Follows: React.FC<{
/* @ts-expect-error inferred props are wrong */
id={accountId}
key={accountId}
withBio={false}
withBio
/>
))}
</ScrollableList>