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.

Thibaut Girka 249991c498 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - Gemfile.lock - app/controllers/accounts_controller.rb - app/controllers/admin/dashboard_controller.rb - app/controllers/follower_accounts_controller.rb - app/controllers/following_accounts_controller.rb - app/controllers/remote_follow_controller.rb - app/controllers/stream_entries_controller.rb - app/controllers/tags_controller.rb - app/javascript/packs/public.js - app/lib/sanitize_config.rb - app/models/account.rb - app/models/form/admin_settings.rb - app/models/media_attachment.rb - app/models/stream_entry.rb - app/models/user.rb - app/serializers/initial_state_serializer.rb - app/services/batched_remove_status_service.rb - app/services/post_status_service.rb - app/services/process_mentions_service.rb - app/services/reblog_service.rb - app/services/remove_status_service.rb - app/views/admin/settings/edit.html.haml - config/locales/simple_form.pl.yml - config/settings.yml - docker-compose.yml		5 years ago
..
admin	Add moderation API (#9387)	5 years ago
v2	…
account_serializer.rb	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
application_serializer.rb	Add vapid_key to the application entity in the REST API (#10058)	5 years ago
context_serializer.rb	…
conversation_serializer.rb	…
credential_account_serializer.rb	…
custom_emoji_serializer.rb	Add categories for custom emojis (#11196)	5 years ago
filter_serializer.rb	…
identity_proof_serializer.rb	squashed identity proof updates (#10375)	5 years ago
instance_serializer.rb	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
list_serializer.rb	…
media_attachment_serializer.rb	Add blurhash (#10630)	5 years ago
mute_serializer.rb	…
notification_serializer.rb	Support pushing and receiving updates to poll tallies (#10209)	5 years ago
poll_serializer.rb	Add support for custom emojis in poll options (#10322)	5 years ago
preferences_serializer.rb	Add a preferences API so apps can share basic behaviours (#10109)	5 years ago
preview_card_serializer.rb	…
relationship_serializer.rb	Improve blocked view of profiles (#10491)	5 years ago
report_serializer.rb	…
scheduled_status_serializer.rb	…
search_serializer.rb	…
status_serializer.rb	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
tag_serializer.rb	…
web_push_subscription_serializer.rb	…