Claire 193250556c Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `README.md`: Upstream changed their README, we have our own. Kept ours. - `app/helpers/application_helper.rb`: Minor code style fix upstream, on a line that is different in glitch-soc due to the different theming system. Applied the code style fix to our own code. - `app/views/settings/preferences/appearance/show.html.haml`: Code style fix on a line next to lines exclusive to glitch-soc. Applied upstream changes. - `yarn.lock`: Upstream updated a dependency textually close to a glitch-soc-only dependency. Updated the dependency like upstream did.		2023-03-16 23:12:59 +01:00
..
admin	Fix unserialized role on account entities in admin API (#23290)	2023-01-29 15:59:58 +01:00
keys
trends
v1	Advertise supported MIME types for statuses (#2090)	2023-01-20 13:57:32 +01:00
account_serializer.rb	Merge branch 'main' into glitch-soc/merge-upstream	2023-02-19 10:42:55 +01:00
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	Merge branch 'main' into glitch-soc/merge-upstream	2023-02-19 10:42:55 +01:00
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	Add lang attribute to preview card (#23869)	2023-02-24 20:04:38 +01:00
privacy_policy_serializer.rb	Autofix Rubocop Style/FormatString (#23743)	2023-02-20 07:58:33 +01:00
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	Merge branch 'main' into glitch-soc/merge-upstream	2023-03-16 23:12:59 +01:00
status_source_serializer.rb
suggestion_serializer.rb
tag_serializer.rb
translation_serializer.rb
web_push_subscription_serializer.rb	Add missing policy attribute to WebPushSubscriptionSerializer (#23210)	2023-01-23 13:05:30 +01:00