Claire b474cbbd28 Merge commit '7840c6b75b61e64d89d7fd9f291277fb177e513f' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/api/v1/accounts/relationships_controller.rb`: We differed by listing suspended users when requesting relationships. Updated to upstream's code.		2023-12-18 18:40:58 +01:00
..
activitypub	Extract shared example for cacheable response in specs (#25388)	2023-10-16 17:52:06 +02:00
admin	Remove unused before block from settings/branding spec (#27759)	2023-11-07 15:19:17 +00:00
api	Merge commit '7840c6b75b61e64d89d7fd9f291277fb177e513f' into glitch-soc/merge-upstream	2023-12-18 18:40:58 +01:00
auth	Fix `RSpec/InstanceVariable` cop (#27766)	2023-11-08 15:42:30 +00:00
concerns	Fix `RSpec/InstanceVariable` cop (#27766)	2023-11-08 15:42:30 +00:00
disputes	…
filters	…
oauth	…
settings	Merge commit 'b87bfb8c96c8491f1228e0258d05119f3420db05' into glitch-soc/merge-upstream	2023-12-18 18:34:25 +01:00
well_known	Fix `RSpec/HookArgument` cop (#27747)	2023-11-07 09:10:36 +00:00
.rubocop.yml	…
about_controller_spec.rb	…
accounts_controller_spec.rb	Minor speed improvement on `controllers/accounts` spec (#27679)	2023-11-09 16:21:11 +00:00
application_controller_spec.rb	…
authorize_interactions_controller_spec.rb	…
custom_css_controller_spec.rb	…
emojis_controller_spec.rb	Consolidate JSON parsing in serializers specs (#27693)	2023-11-07 15:20:24 +00:00
filters_controller_spec.rb	…
follower_accounts_controller_spec.rb	…
following_accounts_controller_spec.rb	…
health_controller_spec.rb	…
home_controller_spec.rb	Use framework helpers instead of i-vars in controller specs (#27767)	2023-11-08 08:17:43 +00:00
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	Fix `RSpec/InstanceVariable` cop (#27766)	2023-11-08 15:42:30 +00:00
statuses_controller_spec.rb	Extract shared example for cacheable response in specs (#25388)	2023-10-16 17:52:06 +02:00
tags_controller_spec.rb	…