Claire 0b2c7cdb02 Merge commit 'fe2667bb0d3487a32b9da5250402a90482a85fe2' into glitch-soc/merge-upstream ... Conflicts: - `app/lib/content_security_policy.rb`: Conflict caused by glitch-soc's support for the extra `EXTRA_DATA_HOSTS` environment variable. Ported upstream's changes while keeping support for `EXTRA_DATA_HOSTS`.		2024-01-10 17:51:12 +01:00
..
admin	Add ability to require approval when users sign up using specific email domains (#28468)	2024-01-04 09:07:05 +00:00
keys	…
trends	…
v1	…
account_serializer.rb	Merge commit '272592d16d40e804ec325ef3b5e6de9bbad5f2dd' into glitch-soc/merge-upstream	2023-12-20 22:05:31 +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 commit '85662a5a57531af5402a6777d0b1089e78c56815' into glitch-soc/merge-upstream	2023-12-20 20:10:45 +01:00
language_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	…
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	…