You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Claire 63992c6900 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.		2 years ago
..
credentials_controller.rb	Allow changing hide_collections setting with the api (#22790)	2 years ago
familiar_followers_controller.rb	Add `/api/v1/accounts/familiar_followers` to REST API (#17700)	3 years ago
featured_tags_controller.rb	Use existing FeaturedTag serializer and delete AccountFeaturedTag serializer (#15415)	4 years ago
follower_accounts_controller.rb	Autofix Rubocop Style/IfUnlessModifier (#23697)	2 years ago
following_accounts_controller.rb	Autofix Rubocop Style/IfUnlessModifier (#23697)	2 years ago
identity_proofs_controller.rb	Remove Keybase integration (#17045)	3 years ago
lists_controller.rb	Change REST API to return empty data for suspended accounts (#14765)	4 years ago
lookup_controller.rb	Fix error when looking handle with surrounding spaces (#18225)	3 years ago
notes_controller.rb	Add user notes on accounts (#14148)	4 years ago
pins_controller.rb	Make account endorsements idempotent (fix #19045) (#20118)	2 years ago
relationships_controller.rb	Do not filter out temporarily-suspended accounts from relationships API	4 years ago
search_controller.rb	Remove useless `respond_to` calls (#13208)	5 years ago
statuses_controller.rb	Autofix Rubocop Style/IfUnlessModifier (#23697)	2 years ago