Claire 7452a95998 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `.github/dependabot.yml`: Upstream made changes while we have dropped this file. Keep the file deleted. - `.prettierignore`: Upstream made changes at the end of the file, where we had our extra lines. Just moved our extra lines back at the end. - `app/serializers/initial_state_serializer.rb`: Upstream code style changes. Applied them. - `app/services/backup_service.rb`: Upstream code style changes. Applied them.		2023-02-19 10:42:55 +01:00
..
account_counters_spec.rb	Improve account counters handling (#15913)	2021-03-19 13:14:57 +01:00
account_finder_concern_spec.rb	Handle nil and blank cases in Account finders (#3500)	2017-06-01 08:20:36 -04:00
account_interactions_spec.rb	Merge branch 'main' into glitch-soc/merge-upstream	2023-02-19 10:42:55 +01:00
remotable_spec.rb	Autofix Rails/EagerEvaluationLogMessage (#23429)	2023-02-07 03:44:36 +01:00
status_threading_concern_spec.rb	Record account suspend/silence time and keep track of domain blocks (#10660)	2019-05-14 19:05:02 +02:00