Claire b28ce2424c Merge commit 'c40ab43dc703be988c277d4ba6b7987a3a80e16c' into glitch-soc/merge-upstream ... Conflicts: - `app/helpers/application_helper.rb`: Upstream added a helper where glitch-soc had its own, not really a conflict. Added upstream's helper. - `lib/sanitize_ext/sanitize_config.rb`: Upstream renamed a constant that was used slightly differently in glitch-soc. Renamed it as upstream did.		2024-10-06 16:07:58 +02:00
..
account_relationships_presenter_spec.rb	Fix call to inefficient delete_matched cache method in domain blocks (#28374)	2023-12-18 16:14:43 +00:00
export_summary_spec.rb	Extract ExportSummary class for account object counts (#32227)	2024-10-03 13:09:58 +00:00
familiar_followers_presenter_spec.rb	Reduce expectations for RSpec/MultipleExpectations cop in spec/presenters specs (#27881)	2023-11-16 14:37:52 +00:00
instance_presenter_spec.rb	Merge commit 'fe04291af46d7cb9d3439fa73739b2ffb2b53d72' into glitch-soc/merge-upstream	2024-09-04 19:38:52 +02:00
status_relationships_presenter_spec.rb	Reduce expectations for RSpec/MultipleExpectations cop in spec/presenters specs (#27881)	2023-11-16 14:37:52 +00:00