Claire b3542ac57b Merge commit '1184887b012e863fbf44f65ef5c65e0049123c27' into glitch-soc/merge-upstream ...

Conflicts:
- `README.md`:
  Upstream updated its README, we have a completely different one.
  Kept our README.

2024-01-02 13:35:11 +01:00

..

accounts

Fix call to inefficient delete_matched cache method in domain blocks (#28374)

2023-12-18 16:14:43 +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

Convert /instances/* controller specs to request specs (#27988)

2023-11-20 11:05:28 +00:00

lists

…

peers

Improve interaction modal error handling (#26795)

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

polls

…

profile

…

push

…

statuses

Remove default_scope from StatusEdit class (#28042)

2023-11-23 09:26:11 +00:00

timelines

Merge commit '7e1a77ea51e6dc4aecbf678f8928aa96698fa072' into glitch-soc/merge-upstream

2023-12-19 19:51:40 +01:00

trends

…

accounts_controller.rb

Fix call to inefficient delete_matched cache method in domain blocks (#28374)

2023-12-18 16:14:43 +00:00

announcements_controller.rb

…

apps_controller.rb

…

blocks_controller.rb

…

bookmarks_controller.rb

…

conversations_controller.rb

Change link previews to keep original URL from the status (#27312)

2023-11-13 09:58:28 +00:00

custom_emojis_controller.rb

…

directories_controller.rb

Fix Style/RedundantReturn cop (#28391)

2023-12-18 09:50:51 +00:00

domain_blocks_controller.rb

…

endorsements_controller.rb

…

favourites_controller.rb

…

featured_tags_controller.rb

…

filters_controller.rb

…

follow_requests_controller.rb

Fix call to inefficient delete_matched cache method in domain blocks (#28374)

2023-12-18 16:14:43 +00:00

followed_tags_controller.rb

…

instances_controller.rb

…

invites_controller.rb

Add support for invite codes in the registration API (#27805)

2023-11-13 13:27:00 +00:00

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

Fix streaming API redirection ignoring the port of streaming_api_base_url (#28558)

2024-01-02 12:27:51 +00:00

suggestions_controller.rb

Change algorithm of follow recommendations (#28314)

2023-12-19 10:59:43 +00:00

tags_controller.rb

…