Claire a5127d0ef8 Merge commit '24319836de6046fb2985ec1a24c30ad7d47584d7' into glitch-soc/merge-upstream ... Conflicts: - `config/routes/api.rb`: glitch-soc has an extra `:destroy` action on notifications for historical reasons. Kept it for now, while otherwise updating as upstream did.		2024-03-11 17:29:07 +01:00
..
activitypub	…
admin	Add `change` block expectation to `admin/invites#deactivate_all` spec (#29412)	2024-02-27 16:25:58 +00:00
api	…
auth	…
concerns	…
disputes	…
filters	…
oauth	…
settings	Merge commit '24319836de6046fb2985ec1a24c30ad7d47584d7' into glitch-soc/merge-upstream	2024-03-11 17:29:07 +01:00
.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	…