Claire b474cbbd28 Merge commit '7840c6b75b61e64d89d7fd9f291277fb177e513f' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/api/v1/accounts/relationships_controller.rb`: We differed by listing suspended users when requesting relationships. Updated to upstream's code.		2023-12-18 18:40:58 +01:00
..
accounts	Allow viewing and severing relationships with suspended accounts (#27667)	2023-11-09 14:50:25 +00:00
admin	Added admin api for managing tags (#26872)	2023-09-13 11:22:53 +02:00
announcements	…
apps	Feature: Allow token introspection without read scope (#27142)	2023-10-18 14:10:07 +02:00
crypto	…
emails	…
featured_tags	…
instances	…
lists	…
peers	…
polls	…
profile	…
push	…
statuses	…
timelines	…
trends	…
accounts_controller.rb	…
announcements_controller.rb	…
apps_controller.rb	…
blocks_controller.rb	…
bookmarks_controller.rb	…
conversations_controller.rb	…
custom_emojis_controller.rb	…
directories_controller.rb	Change `GET /api/v1/directory` to use database replica rather than primary (#26856)	2023-09-08 17:01:02 +02:00
domain_blocks_controller.rb	…
endorsements_controller.rb	…
favourites_controller.rb	…
featured_tags_controller.rb	…
filters_controller.rb	…
follow_requests_controller.rb	…
followed_tags_controller.rb	…
instances_controller.rb	…
lists_controller.rb	…
markers_controller.rb	…
media_controller.rb	…
mutes_controller.rb	…
notifications_controller.rb	…
polls_controller.rb	…
preferences_controller.rb	…
reports_controller.rb	…
scheduled_statuses_controller.rb	…
statuses_controller.rb	…
streaming_controller.rb	…
suggestions_controller.rb	…
tags_controller.rb	…