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.

public/robots.txt

@@ -6,3 +6,4 @@ Disallow: /
 User-agent: *
 Disallow: /media_proxy/
 Disallow: /interact/
+Disallow: /api/v1/instance/domain_blocks