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
..
trends	Autofix Rubocop Style/RedundantBegin (#23703)	2023-02-19 07:09:40 +09:00
account_moderation_notes_helper.rb	Add appeals (#17364)	2022-02-14 21:27:53 +01:00
action_logs_helper.rb	Fix moderation audit log items for warnings having incorrect links (#23242)	2023-01-24 18:50:13 +01:00
announcements_helper.rb	Add announcements (#12662)	2020-01-23 22:00:13 +01:00
dashboard_helper.rb	Autofix Rubocop Style/RedundantBegin (#23703)	2023-02-19 07:09:40 +09:00
filter_helper.rb	Add trending statuses (#17431)	2022-02-25 00:34:14 +01:00
settings_helper.rb	Merge branch 'main' into glitch-soc/merge-upstream	2022-10-28 19:23:58 +02:00