1
0
mirror of https://github.com/funamitech/mastodon synced 2024-12-16 15:48:41 +09:00
YuruToot/app/controllers/api/v1/timelines
Claire 82eebd0482 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.
2023-07-12 15:27:32 +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 First pass at multi-database for read replica using Rails native adapter (#25693) 2023-07-08 19:45:36 +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