Claire b135b6ba8f Merge commit '8ebc94dd22a18c28c4c9763b909e92e6ba64e242' into glitch-soc/merge-upstream ... Conflicts: - `app/views/admin/custom_emojis/new.html.haml`: Conflict caused by glitch-soc having a different file size limit constant name. Updated like upstream did while keeping glitch-soc's constant name.		2023-12-19 21:24:01 +01:00
..
accounts	Deduplicate IDs in relationships and familiar_followers APIs (#27982)	2023-11-23 10:00:09 +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	Refactor `Api::V1::ProfilesController` into two separate controllers (#26573)	2023-08-21 15:47:09 +02:00
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	Add support for invite codes in the registration API (#27805)	2023-11-13 13:27:00 +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	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	Refactor: replace whitelist_mode mentions with limited_federation_mode (#26252)	2023-08-02 19:32:48 +02:00
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	…
suggestions_controller.rb	…
tags_controller.rb	…