Claire a3b6a85521 Merge commit 'cd37048439f9b324f48e6af1f426a7894c54b4da' into glitch-soc/merge-upstream ... Conflicts: - `.prettierignore`: Conflict due to glitch-soc-only files. Kept those at the end of the file.		2024-01-13 12:11:29 +01:00
..
activitypub	Extract spec helper for verifing to/from public AP collection namespace (#28472)	2024-01-11 16:17:21 +00:00
admin	Refresh instance counts in spec (fixes intermittent failure) (#28698)	2024-01-12 09:10:37 +00:00
api	Merge commit '0a7cff53c2577b3e79599e069eeb344f2613ad8d' into glitch-soc/merge-upstream	2024-01-11 13:24:20 +01:00
auth	Use Sidekiq `fake!` instead of `inline!` in specs (#25369)	2024-01-10 11:06:58 +00:00
concerns	Use Sidekiq `fake!` instead of `inline!` in specs (#25369)	2024-01-10 11:06:58 +00:00
disputes	Use Sidekiq `fake!` instead of `inline!` in specs (#25369)	2024-01-10 11:06:58 +00:00
filters	…
oauth	Clean up of `RSpec/LetSetup` within `spec/controllers` (#28446)	2023-12-21 09:28:41 +00:00
settings	Merge commit '2954279e9c630a9d146575bf600978dc6c5279bd' into glitch-soc/merge-upstream	2024-01-11 20:15:19 +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	Clean up of `RSpec/LetSetup` within `spec/controllers` (#28446)	2023-12-21 09:28:41 +00:00
following_accounts_controller_spec.rb	Clean up of `RSpec/LetSetup` within `spec/controllers` (#28446)	2023-12-21 09:28:41 +00:00
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	…