You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
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.
5 years ago
..
direct_controller.rb Remove deprecated REST API `GET /api/v1/timelines/direct` (#11212) 6 years ago
home_controller.rb Remove useless `respond_to` calls (#13208) 5 years ago
list_controller.rb Support min_id-based pagination in REST API (#8736) 7 years ago
public_controller.rb Merge branch 'master' into glitch-soc/merge-upstream 5 years ago
tag_controller.rb Refactor how public and tag timelines are queried (#14728) 5 years ago