Claire fe5f6bc7ed Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `.github/workflows/build-image.yml`: Fix erroneous deletion in a previous merge. - `Gemfile`: Conflict caused by glitch-soc-only hCaptcha dependency - `app/controllers/auth/sessions_controller.rb`: Minor conflict due to glitch-soc's theming system. - `app/controllers/filters_controller.rb`: Minor conflict due to glitch-soc's theming system. - `app/serializers/rest/status_serializer.rb`: Minor conflict due to glitch-soc having an extra `local_only` property		2022-06-28 11:11:18 +02:00
..
admin	Add notifications for new reports (#18697)	2022-06-27 09:30:15 +02:00
keys
trends
v1	Revamp post filtering system (#18058)	2022-06-28 09:42:13 +02:00
account_serializer.rb	Merge branch 'main' into glitch-soc/merge-upstream	2022-05-11 09:37:48 +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
familiar_followers_serializer.rb
featured_tag_serializer.rb
filter_keyword_serializer.rb	Revamp post filtering system (#18058)	2022-06-28 09:42:13 +02:00
filter_result_serializer.rb	Revamp post filtering system (#18058)	2022-06-28 09:42:13 +02:00
filter_serializer.rb	Revamp post filtering system (#18058)	2022-06-28 09:42:13 +02:00
instance_serializer.rb	Merge branch 'main' into glitch-soc/merge-upstream	2022-06-11 00:08:41 +02:00
list_serializer.rb
marker_serializer.rb
media_attachment_serializer.rb
mute_serializer.rb
muted_account_serializer.rb
notification_serializer.rb	Add notifications for new reports (#18697)	2022-06-27 09:30:15 +02: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	Add notifications for new reports (#18697)	2022-06-27 09:30:15 +02:00
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	2022-06-28 11:11:18 +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