Claire 9b861d56a9 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `.env.production.sample`: Copied upstream changes. - `app/controllers/settings/identity_proofs_controller.rb`: Minor conflict due to glitch-soc's extra “enable_keybase” setting. Upstream removed keybase support altogether, so did the same. - `app/controllers/well_known/keybase_proof_config_controller.rb`: Minor conflict due to glitch-soc's extra “enable_keybase” setting. Upstream removed keybase support altogether, so did the same. - `lib/mastodon/statuses_cli.rb`: Minor conflict due to an optimization that wasn't shared between the two versions. Copied upstream's version.		2021-11-26 22:53:55 +01:00
..
admin	Add graphs and retention metrics to admin dashboard (#16829)	2021-10-14 20:44:59 +02: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
notification_serializer.rb
poll_serializer.rb
preferences_serializer.rb
preview_card_serializer.rb
reaction_serializer.rb
relationship_serializer.rb
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	Merge branch 'master' into glitch-soc/merge-upstream	2020-11-07 18:23:02 +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