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

Fix HTTP 500 in /api/v1/emails/check_confirmation (#25595)

2023-07-02 00:05:44 +02:00

featured_tags

…

instances

Add GET /api/v1/instance/languages to REST API (#24443)

2023-08-03 11:25:47 +02:00

lists

…

peers

Improve interaction modal error handling (#26795)

2023-09-05 23:49:48 +02:00

polls

…

profile

Refactor Api::V1::ProfilesController into two separate controllers (#26573)

2023-08-21 15:47:09 +02:00

push

…

statuses

Improve error messages when DeepL quota is exceeded (#26704)

2023-08-29 09:14:44 +02:00

timelines

Merge commit '6c4c72497a5722870e4432ef41dd4c9ec36a8928' into glitch-soc/merge-upstream

2023-09-02 13:50:16 +02:00

trends

…

accounts_controller.rb

Add time zone preference (#25342)

2023-06-10 03:29:37 +02:00

announcements_controller.rb

…

apps_controller.rb

…

blocks_controller.rb

…

bookmarks_controller.rb

Fix Naming/MemoizedInstanceVariableName cop (#25928)

2023-07-12 10:08:51 +02:00

conversations_controller.rb

Add POST /api/v1/conversations/:id/unread (#25509)

2023-06-22 18:46:43 +02:00

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

Fix Naming/MemoizedInstanceVariableName cop (#25928)

2023-07-12 10:08:51 +02:00

featured_tags_controller.rb

Remove dead code in Api::V1::FeaturedTagsController (#25073)

2023-05-23 14:27:37 +02:00

filters_controller.rb

…

follow_requests_controller.rb

…

followed_tags_controller.rb

…

instances_controller.rb

Refactor: replace whitelist_mode mentions with limited_federation_mode (#26252)

2023-08-02 19:32:48 +02:00

lists_controller.rb

Add exclusive lists (#22048)

2023-06-05 09:37:02 +02:00

markers_controller.rb

Change markers API to use a replica (#25851)

2023-07-12 18:57:40 +02:00

media_controller.rb

…

mutes_controller.rb

…

notifications_controller.rb

Merge commit '0d7340380cf3094335d8bc67f7c465e2b154566a' into glitch-soc/merge-upstream

2023-07-13 13:35:15 +02:00

polls_controller.rb

…

preferences_controller.rb

…

reports_controller.rb

Add forward_to_domains parameter to POST /api/v1/reports (#25866)

2023-07-10 18:26:56 +02:00

scheduled_statuses_controller.rb

…

statuses_controller.rb

…

streaming_controller.rb

…

suggestions_controller.rb

…

tags_controller.rb

Remove unfollowed hashtag posts from home feed (#26028)

2023-07-17 13:56:28 +02:00