You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Claire 694c073d1f Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/admin/dashboard_controller.rb`: Upstream completely redesigned the admin dashboard. glitch-soc tracked extra features, but that list is gone. Followed upstram. - `app/views/admin/dashboard/index.html.haml` Upstream completely redesigned the admin dashboard. glitch-soc tracked extra features, but that list is gone. Followed upstram.		3 years ago
..
admin	Add graphs and retention metrics to admin dashboard (#16829)	3 years ago
keys	…
account_serializer.rb	Merge branch 'main' into glitch-soc/merge-upstream	4 years ago
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)	4 years ago
filter_serializer.rb	…
identity_proof_serializer.rb	…
instance_serializer.rb	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
list_serializer.rb	…
marker_serializer.rb	…
media_attachment_serializer.rb	Stop setting a shortcode to newly-created media attachments (#16730)	3 years ago
mute_serializer.rb	…
muted_account_serializer.rb	Add duration parameter to muting. (#13831)	4 years ago
notification_serializer.rb	Add option to be notified when a followed user posts (#13546)	4 years ago
poll_serializer.rb	…
preferences_serializer.rb	…
preview_card_serializer.rb	…
reaction_serializer.rb	…
relationship_serializer.rb	Add option to be notified when a followed user posts (#13546)	4 years ago
report_serializer.rb	…
rule_serializer.rb	Add server rules (#15769)	4 years ago
scheduled_status_serializer.rb	…
search_serializer.rb	…
status_serializer.rb	Merge branch 'master' into glitch-soc/merge-upstream	4 years ago
suggestion_serializer.rb	Add cold-start follow recommendations (#15945)	4 years ago
tag_serializer.rb	…
web_push_subscription_serializer.rb	…