Claire 4415005de7 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/javascript/mastodon/features/compose/components/compose_form.js`: Conflict caused because of minor code style change upstream, while glitch-soc has different code for handling variable maximum chars. Ported the change. - `app/serializers/initial_state_serializer.rb`: Conflict because glitch-soc had two extra attributes where upstream added one. Added upstream's attribute.		2022-05-16 22:29:05 +02:00
..
admin	Change design of federation pages in admin UI (#17704)	2022-03-09 08:52:32 +01:00
keys
trends	Add trending links (#16917)	2021-11-25 13:07:38 +01:00
account_serializer.rb	Merge branch 'main' into glitch-soc/merge-upstream	2022-05-11 09:37:48 +02:00
announcement_serializer.rb	Refactor formatter (#17828)	2022-03-26 02:53:34 +01:00
application_serializer.rb
context_serializer.rb
conversation_serializer.rb
credential_account_serializer.rb
custom_emoji_serializer.rb
encrypted_message_serializer.rb
familiar_followers_serializer.rb	Add /api/v1/accounts/familiar_followers to REST API (#17700)	2022-03-07 09:36:47 +01:00
featured_tag_serializer.rb
filter_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	Add notifications when a reblogged status has been updated (#17404)	2022-02-11 22:20:19 +01:00
poll_serializer.rb
preferences_serializer.rb	Fix preferred posting language returning unusable value in REST API (#18428)	2022-05-16 19:13:36 +02:00
preview_card_serializer.rb
reaction_serializer.rb
relationship_serializer.rb
report_serializer.rb
rule_serializer.rb
scheduled_status_serializer.rb
search_serializer.rb
status_edit_serializer.rb	Refactor formatter (#17828)	2022-03-26 02:53:34 +01:00
status_serializer.rb	Merge branch 'main' into glitch-soc/merge-upstream	2022-04-06 16:06:15 +02:00
status_source_serializer.rb	Add content-type to status source in glitch-soc	2022-01-20 00:03:44 +01:00
suggestion_serializer.rb
tag_serializer.rb
web_push_subscription_serializer.rb