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
..
v1	Merge branch 'main' into glitch-soc/merge-upstream	2023-02-19 10:42:55 +01:00
v2	Autofix Rubocop Lint/ParenthesesAsGroupedExpression (#23682)	2023-02-18 04:00:05 +01:00
web	Autofix Rubocop RSpec/EmptyLineAfterFinalLet (#23707)	2023-02-19 07:10:19 +09:00
base_controller_spec.rb	Refactor and improve tests (#17386)	2022-01-28 00:46:42 +01:00
oembed_controller_spec.rb	Remove Atom feeds and old URLs in the form of GET /:username/updates/:id (#11247)	2019-07-07 16:16:51 +02:00