Claire 993d0a9950 Merge commit '1e3b19230a48174acf524cf1a9f5a498e220ea7d' into glitch-soc/merge-upstream ... Conflicts: - `app/models/account.rb`: Upstream added new validations close to lines on which glitch-soc had modified validations to handle custom limits set through environment variables. Ported upstream changes. - `config/initializers/content_security_policy.rb`: Upstream added `AZURE_ALIAS_HOST`. Glitch-soc's version of the file is completely different. Added `AZURE_ALIAS_HOST` to our version of the file.		2023-07-30 13:15:01 +02:00
..
admin	Add trend management to admin API (#24257)	2023-04-18 11:33:30 +02:00
keys
trends
v1
account_serializer.rb	Fix most rubocop issues (#2165)	2023-04-09 11:25:30 +02: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 'b896b16cb3c8626fbee12a7eda7f882114b1a040' into glitch-soc/merge-upstream	2023-05-28 15:01:53 +02:00
list_serializer.rb	Add exclusive lists (#22048)	2023-06-05 09:37:02 +02:00
marker_serializer.rb
media_attachment_serializer.rb
mute_serializer.rb	Fix most rubocop issues (#2165)	2023-04-09 11:25:30 +02:00
muted_account_serializer.rb
notification_serializer.rb
poll_serializer.rb
preferences_serializer.rb
preview_card_serializer.rb	Merge pull request from GHSA-ccm4-vgcc-73hp	2023-07-06 15:03:33 +02:00
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	Merge commit '1e3b19230a48174acf524cf1a9f5a498e220ea7d' into glitch-soc/merge-upstream	2023-07-30 13:15:01 +02:00
status_source_serializer.rb
suggestion_serializer.rb
tag_serializer.rb
translation_serializer.rb	Translate CW, poll options and media descriptions (#24175)	2023-06-01 00:10:21 +02:00
web_push_subscription_serializer.rb