Leatherface/mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2025-12-14 16:28:59 +00:00
Code Issues Packages Projects Releases Wiki Activity
Files
89ff8c8fd9a32b48bd56758a22dbb56e69756237
mastodon/app/controllers/api/v1/timelines
History
Claire cd1e3ac2c7 Merge commit '7e1a77ea51e6dc4aecbf678f8928aa96698fa072' into glitch-soc/merge-upstream 
Conflicts:
- `app/controllers/api/v1/timelines/public_controller.rb`:
  Upstream refactored this code, the conflict was because of an extra supported
  parameter, `allow_local_only`.
  Updated the controller to follow upstream's refactor, and moved the extra
  parameter definition accordingly.
2023-12-19 19:51:40 +01:00
..
base_controller.rb
Add base class for api/v1/timelines/* controllers (#27840)
2023-11-14 14:53:31 +00: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
Add base class for api/v1/timelines/* controllers (#27840)
2023-11-14 14:53:31 +00:00
list_controller.rb
Add base class for api/v1/timelines/* controllers (#27840)
2023-11-14 14:53:31 +00:00
public_controller.rb
Merge commit '7e1a77ea51e6dc4aecbf678f8928aa96698fa072' into glitch-soc/merge-upstream
2023-12-19 19:51:40 +01:00
tag_controller.rb
Add base class for api/v1/timelines/* controllers (#27840)
2023-11-14 14:53:31 +00:00