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		2019-07-19 18:26:49 +02:00
..
accept_follow_serializer.rb	Remove unused ActivityPub `@context` values depending on response (#10378)	2019-03-27 15:55:23 +01:00
activity_serializer.rb	Fix activity being rendered within activity due to caching (#11271)	2019-07-10 00:43:30 +02:00
actor_serializer.rb	Add ActivityPub actor representing the entire server (#11321)	2019-07-19 01:44:42 +02:00
add_serializer.rb	Remove unused ActivityPub `@context` values depending on response (#10378)	2019-03-27 15:55:23 +01:00
block_serializer.rb	Remove unused ActivityPub `@context` values depending on response (#10378)	2019-03-27 15:55:23 +01:00
collection_serializer.rb	Fix activity being rendered within activity due to caching (#11271)	2019-07-10 00:43:30 +02:00
delete_actor_serializer.rb	Remove unused ActivityPub `@context` values depending on response (#10378)	2019-03-27 15:55:23 +01:00
delete_serializer.rb	Remove unused ActivityPub `@context` values depending on response (#10378)	2019-03-27 15:55:23 +01:00
emoji_serializer.rb	Fix activity being rendered within activity due to caching (#11271)	2019-07-10 00:43:30 +02:00
flag_serializer.rb	Remove unused ActivityPub `@context` values depending on response (#10378)	2019-03-27 15:55:23 +01:00
follow_serializer.rb	Remove unused ActivityPub `@context` values depending on response (#10378)	2019-03-27 15:55:23 +01:00
image_serializer.rb	Remove unused ActivityPub `@context` values depending on response (#10378)	2019-03-27 15:55:23 +01:00
like_serializer.rb	Remove unused ActivityPub `@context` values depending on response (#10378)	2019-03-27 15:55:23 +01:00
note_serializer.rb	Fix activity being rendered within activity due to caching (#11271)	2019-07-10 00:43:30 +02:00
outbox_serializer.rb	Federate pinned statuses over ActivityPub (#6610)	2018-03-04 09:19:11 +01:00
public_key_serializer.rb	Remove unused ActivityPub `@context` values depending on response (#10378)	2019-03-27 15:55:23 +01:00
reject_follow_serializer.rb	Remove unused ActivityPub `@context` values depending on response (#10378)	2019-03-27 15:55:23 +01:00
remove_serializer.rb	Remove unused ActivityPub `@context` values depending on response (#10378)	2019-03-27 15:55:23 +01:00
undo_announce_serializer.rb	Remove unused ActivityPub `@context` values depending on response (#10378)	2019-03-27 15:55:23 +01:00
undo_block_serializer.rb	Remove unused ActivityPub `@context` values depending on response (#10378)	2019-03-27 15:55:23 +01:00
undo_follow_serializer.rb	Remove unused ActivityPub `@context` values depending on response (#10378)	2019-03-27 15:55:23 +01:00
undo_like_serializer.rb	Remove unused ActivityPub `@context` values depending on response (#10378)	2019-03-27 15:55:23 +01:00
update_poll_serializer.rb	Fix account URI in UpdatePollSerializer (#11194)	2019-06-27 19:41:55 +02:00
update_serializer.rb	Remove unused ActivityPub `@context` values depending on response (#10378)	2019-03-27 15:55:23 +01:00
vote_serializer.rb	Remove unused ActivityPub `@context` values depending on response (#10378)	2019-03-27 15:55:23 +01:00