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.rb	Allow changing hide_collections setting with the api (#22790)	2023-01-13 16:40:21 +01:00
familiar_followers_controller.rb	Add /api/v1/accounts/familiar_followers to REST API (#17700)	2022-03-07 09:36:47 +01:00
featured_tags_controller.rb	Use existing FeaturedTag serializer and delete AccountFeaturedTag serializer (#15415)	2020-12-23 16:43:38 +01:00
follower_accounts_controller.rb	Autofix Rubocop Style/IfUnlessModifier (#23697)	2023-02-18 12:37:47 +01:00
following_accounts_controller.rb	Autofix Rubocop Style/IfUnlessModifier (#23697)	2023-02-18 12:37:47 +01:00
identity_proofs_controller.rb	Remove Keybase integration (#17045)	2021-11-26 05:58:18 +01:00
lists_controller.rb	Change REST API to return empty data for suspended accounts (#14765)	2020-09-11 15:16:29 +02:00
lookup_controller.rb	Fix error when looking handle with surrounding spaces (#18225)	2022-05-02 01:00:08 +02:00
notes_controller.rb	Add user notes on accounts (#14148)	2020-06-30 19:19:50 +02:00
pins_controller.rb	Make account endorsements idempotent (fix #19045) (#20118)	2022-11-08 16:39:15 +01:00
relationships_controller.rb	Do not filter out temporarily-suspended accounts from relationships API	2020-09-28 17:56:16 +02:00
search_controller.rb	Remove useless respond_to calls (#13208)	2020-03-06 01:29:38 +01:00
statuses_controller.rb	Autofix Rubocop Style/IfUnlessModifier (#23697)	2023-02-18 12:37:47 +01:00