Claire 2d09653d50 Merge commit '0d7340380cf3094335d8bc67f7c465e2b154566a' into glitch-soc/merge-upstream ...

Conflicts:
- app/controllers/application_controller.rb:
  Upstream added an `include` where we had an extra `include` due to
  glitch-soc's theming system.
  Added upstream's new `include`.

2023-07-13 13:35:15 +02:00

..

direct_controller.rb

Remove deprecated REST API GET /api/v1/timelines/direct (#11212)

2019-07-05 02:14:56 +02:00

home_controller.rb

Change notifications API to use a replica (#25874)

2023-07-12 17:06:00 +02:00

list_controller.rb

Support min_id-based pagination in REST API (#8736)

2018-09-28 02:23:45 +02:00

public_controller.rb

Merge branch 'main' into glitch-soc/merge-upstream

2023-04-29 10:44:56 +02:00

tag_controller.rb

Change unauthenticated responses to be cached in REST API (#24348)

2023-04-25 15:41:34 +02:00