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
keys
trends
account_serializer.rb
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
filter_serializer.rb	Fix filter ID not being a string in REST API (#9303)	2018-11-19 10:37:57 +01:00
instance_serializer.rb
list_serializer.rb	Add backend support to read and update list-specific show_replies settings	2018-11-28 14:46:07 +01:00
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	Define a serializer for /api/v1/mutes/details	2017-09-13 21:47:30 -05:00
muted_account_serializer.rb	Add duration parameter to muting. (#13831)	2020-10-13 01:01:14 +02:00
notification_serializer.rb
poll_serializer.rb
preferences_serializer.rb
preview_card_serializer.rb
reaction_serializer.rb
relationship_serializer.rb
report_serializer.rb	Change IDs to strings rather than numbers in API JSON output (#5019)	2017-09-20 14:53:48 +02:00
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
suggestion_serializer.rb
tag_serializer.rb	Track trending tags (#7638)	2018-05-27 21:45:30 +02:00
web_push_subscription_serializer.rb	Fix alerts booleans not being typecast correctly in push subscription (#11343)	2019-07-21 18:10:07 +02:00