Claire 6c20dad201 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `README.md`: Upstream updated its README, while we have a completely different one. Kept our README. - `app/controllers/concerns/web_app_controller_concern.rb`: Conflict because of glitch-soc's theming system. Additionally, glitch-soc has different behavior regarding moved accounts. Ported some of the changes, but kept our overall behavior. - `app/javascript/packs/admin.js`: Code changes actually applied to `app/javascript/core/admin.js`		2023-01-05 14:16:25 +01:00
..
admin	Add sensitized to Admin::Account serializer (fix #19148) (#20094)	2022-11-08 17:15:54 +01:00
keys
trends
v1	Merge branch 'main' into glitch-soc/merge-upstream	2022-10-28 19:23:58 +02:00
account_serializer.rb
announcement_serializer.rb
application_serializer.rb
context_serializer.rb
conversation_serializer.rb
credential_account_serializer.rb
custom_emoji_serializer.rb
domain_block_serializer.rb
encrypted_message_serializer.rb
extended_description_serializer.rb
familiar_followers_serializer.rb
featured_tag_serializer.rb
filter_keyword_serializer.rb
filter_result_serializer.rb
filter_serializer.rb
filter_status_serializer.rb
instance_serializer.rb
list_serializer.rb
marker_serializer.rb
media_attachment_serializer.rb
mute_serializer.rb
muted_account_serializer.rb
notification_serializer.rb
poll_serializer.rb
preferences_serializer.rb	Add reading:autoplay:gifs to /api/v1/preferences (#22706)	2023-01-05 13:31:05 +01:00
preview_card_serializer.rb
privacy_policy_serializer.rb
reaction_serializer.rb
relationship_serializer.rb
report_serializer.rb
role_serializer.rb
rule_serializer.rb
scheduled_status_serializer.rb
search_serializer.rb
status_edit_serializer.rb
status_serializer.rb
status_source_serializer.rb
suggestion_serializer.rb
tag_serializer.rb
translation_serializer.rb
web_push_subscription_serializer.rb