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 f8d867bac4 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/services/remove_status_service.rb`: Conflict caused by us having a distinc Direct timeline. Ported upstream changes. - `app/javascript/mastodon/features/compose/components/compose_form.js`: Conflict between glitch-soc's variable character limit and upstream refactoring that part of the code. Ported upstream changes.		4 years ago
..
credentials_controller.rb	…
featured_tags_controller.rb	Fix incorrect conditions for suspended accounts in Get API for account featured tags (#15270)	4 years ago
follower_accounts_controller.rb	Change REST API to return empty data for suspended accounts (#14765)	4 years ago
following_accounts_controller.rb	Change REST API to return empty data for suspended accounts (#14765)	4 years ago
identity_proofs_controller.rb	Change REST API to return empty data for suspended accounts (#14765)	4 years ago
lists_controller.rb	Change REST API to return empty data for suspended accounts (#14765)	4 years ago
notes_controller.rb	…
pins_controller.rb	…
relationships_controller.rb	Do not filter out temporarily-suspended accounts from relationships API	4 years ago
search_controller.rb	…
statuses_controller.rb	Change REST API to return empty data for suspended accounts (#14765)	4 years ago