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 90528f43bc Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `config/webpack/configuration.js`: Upstream updated the `js-yaml` dependency, which changed how to call it. Those changes conflicted because that code is pretty different in glitch-soc which has to deal with its more complex theming system. Proceeded to the same compatibility changes in glitch-soc's code. - `package.json` and `yarn.lock`: Not really a conflict, just glitch-soc-specific dependencies textually too close to some dependencies updated upstream.		3 years ago
..
credentials_controller.rb	make it not return http 400 when passing and empty source argument (#12259)	5 years ago
featured_tags_controller.rb	Use existing FeaturedTag serializer and delete AccountFeaturedTag serializer (#15415)	3 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	Add user notes on accounts (#14148)	4 years ago
pins_controller.rb	Remove useless `respond_to` calls (#13208)	4 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)	4 years ago
statuses_controller.rb	Change REST API to return empty data for suspended accounts (#14765)	4 years ago