monorail
/
mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
mastodon/app/controllers/api/v1/timelines
History
Claire e61a7794f8 Merge commit 'df9e26158d9787859b24bdc276af478abf05e1af' into glitch-soc/merge-upstream 
Conflicts:
- `lib/sanitize_ext/sanitize_config.rb`:
  Conflict because glitch-soc has a different list of allowed tags.
  Added upstream's new allowed tags while keeping ours.
- `spec/requests/api/v1/timelines/public_spec.rb`:
  Conflict because of glitch-soc's default settings.
  Updated accordingly.
 		2024-07-04 17:12:14 +02:00
..
base_controller.rb Merge pull request from GHSA-58x8-3qxw-6hm7 2024-07-04 16:26:49 +02:00
direct_controller.rb Merge commit 'b2388be71eb0031ef9e47c492b1c038231cd8bc0' into glitch-soc/merge-upstream 2024-05-16 19:30:10 +02:00
home_controller.rb Rename `cache_*` methods to `preload_*` in controller concern (#30209) 2024-05-16 08:03:46 +00:00
link_controller.rb Merge pull request from GHSA-58x8-3qxw-6hm7 2024-07-04 16:26:49 +02:00
list_controller.rb Rename `cache_*` methods to `preload_*` in controller concern (#30209) 2024-05-16 08:03:46 +00:00
public_controller.rb Merge commit 'df9e26158d9787859b24bdc276af478abf05e1af' into glitch-soc/merge-upstream 2024-07-04 17:12:14 +02:00
tag_controller.rb Merge pull request from GHSA-58x8-3qxw-6hm7 2024-07-04 16:26:49 +02:00