Claire b3bf32a21e Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/views/admin/reports/show.html.haml`: Conflicts due to glitch-soc's theming system.		2022-01-17 10:45:25 +01:00
..
admin	Add notifications for statuses deleted by moderators (#17204)	2022-01-17 09:41:33 +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	2021-05-09 10:41:28 +02:00
announcement_serializer.rb
application_serializer.rb
context_serializer.rb
conversation_serializer.rb
credential_account_serializer.rb
custom_emoji_serializer.rb
encrypted_message_serializer.rb
featured_tag_serializer.rb	Use existing FeaturedTag serializer and delete AccountFeaturedTag serializer (#15415)	2020-12-23 16:43:38 +01:00
filter_serializer.rb
instance_serializer.rb	Merge branch 'main' into glitch-soc/merge-upstream	2021-07-11 21:41:23 +02:00
list_serializer.rb
marker_serializer.rb
media_attachment_serializer.rb	Stop setting a shortcode to newly-created media attachments (#16730)	2021-09-13 18:59:37 +02:00
mute_serializer.rb
muted_account_serializer.rb	Add duration parameter to muting. (#13831)	2020-10-13 01:01:14 +02:00
notification_serializer.rb	Add option to be notified when a followed user posts (#13546)	2020-09-18 17:26:45 +02:00
poll_serializer.rb
preferences_serializer.rb
preview_card_serializer.rb
reaction_serializer.rb
relationship_serializer.rb	Add option to be notified when a followed user posts (#13546)	2020-09-18 17:26:45 +02:00
report_serializer.rb
rule_serializer.rb	Add server rules (#15769)	2021-02-21 19:50:12 +01:00
scheduled_status_serializer.rb
search_serializer.rb
status_serializer.rb	Fix pinned attribute not being set for private self-posts	2022-01-17 09:52:19 +01:00
suggestion_serializer.rb	Add cold-start follow recommendations (#15945)	2021-04-12 12:37:14 +02:00
tag_serializer.rb
web_push_subscription_serializer.rb