Claire 2810231180 Merge commit 'b2388be71eb0031ef9e47c492b1c038231cd8bc0' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/activitypub/collections_controller.rb`: Upstream renamed a helper method everywhere. There was one glitch-soc line involving changes because of the local-only post feature. Ported upstream's change.		2024-05-16 19:30:10 +02:00
..
activitypub	…
admin	…
api	…
auth	…
concerns	Rename `cache_*` methods to `preload_*` in controller concern (#30209)	2024-05-16 08:03:46 +00:00
disputes	…
filters	…
oauth	…
settings	…
.rubocop.yml	…
about_controller_spec.rb	…
application_controller_spec.rb	…
authorize_interactions_controller_spec.rb	…
custom_css_controller_spec.rb	…
emojis_controller_spec.rb	…
filters_controller_spec.rb	…
follower_accounts_controller_spec.rb	…
following_accounts_controller_spec.rb	…
health_controller_spec.rb	…
home_controller_spec.rb	…
instance_actors_controller_spec.rb	…
intents_controller_spec.rb	…
invites_controller_spec.rb	…
manifests_controller_spec.rb	…
media_controller_spec.rb	…
media_proxy_controller_spec.rb	…
privacy_controller_spec.rb	…
relationships_controller_spec.rb	…
shares_controller_spec.rb	…
statuses_cleanup_controller_spec.rb	…
statuses_controller_spec.rb	…
tags_controller_spec.rb	…