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
..
credentials_controller_spec.rb	Merge branch 'main' into glitch-soc/merge-upstream	2023-02-19 10:42:55 +01:00
follower_accounts_controller_spec.rb	Refactor and improve tests (#17386)	2022-01-28 00:46:42 +01:00
following_accounts_controller_spec.rb	Refactor and improve tests (#17386)	2022-01-28 00:46:42 +01:00
lists_controller_spec.rb	Refactor and improve tests (#17386)	2022-01-28 00:46:42 +01:00
notes_controller_spec.rb	Spelling (#17705)	2022-03-06 22:51:40 +01:00
pins_controller_spec.rb	Refactor and improve tests (#17386)	2022-01-28 00:46:42 +01:00
relationships_controller_spec.rb	Refactor and improve tests (#17386)	2022-01-28 00:46:42 +01:00
search_controller_spec.rb	Refactor and improve tests (#17386)	2022-01-28 00:46:42 +01:00
statuses_controller_spec.rb	Add tests to indicate inclusion of self replies in statuses endpoint (#23266)	2023-02-13 16:04:26 +01:00