mastodon/app/controllers/api/v1/timelines
Thibaut Girka 9748f074a3 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- app/controllers/api/v1/timelines/public_controller.rb
- app/lib/feed_manager.rb
- app/models/status.rb
- app/services/precompute_feed_service.rb
- app/workers/feed_insert_worker.rb
- spec/models/status_spec.rb

All conflicts are due to upstream refactoring feed management and us having
local-only toots on top of that. Rewrote local-only toots management for
upstream's changes.
2020-09-08 16:26:47 +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 Remove useless respond_to calls (#13208) 2020-03-06 01:29:38 +01: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 'master' into glitch-soc/merge-upstream 2020-09-08 16:26:47 +02:00
tag_controller.rb Refactor how public and tag timelines are queried (#14728) 2020-09-07 11:02:04 +02:00