Thibaut Girka e5f934ddf0 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/activitypub/collections_controller.rb`: Conflict caused because we have additional code to make sure pinned local-only toots don't get rendered on the ActivityPub endpoints. Ported upstream changes.		2020-09-07 09:21:38 +02:00
..
activitypub
account_search_service_spec.rb
after_block_domain_from_account_service_spec.rb
after_block_service_spec.rb
app_sign_up_service_spec.rb
authorize_follow_service_spec.rb
batched_remove_status_service_spec.rb
block_domain_service_spec.rb
block_service_spec.rb
bootstrap_timeline_service_spec.rb
clear_domain_media_service_spec.rb	Make domain block/silence/reject-media code more robust (#13424)	2020-06-09 10:32:00 +02:00
fan_out_on_write_service_spec.rb
favourite_service_spec.rb
fetch_link_card_service_spec.rb
fetch_oembed_service_spec.rb
fetch_remote_status_service_spec.rb
fetch_resource_service_spec.rb
follow_service_spec.rb
hashtag_query_service_spec.rb
import_service_spec.rb
mute_service_spec.rb
notify_service_spec.rb
post_status_service_spec.rb
precompute_feed_service_spec.rb
process_mentions_service_spec.rb
reblog_service_spec.rb
reject_follow_service_spec.rb
remove_status_service_spec.rb
report_service_spec.rb
resolve_account_service_spec.rb
resolve_url_service_spec.rb
search_service_spec.rb	Fix hashtag search performing account search as well (#13758)	2020-05-14 23:37:37 +02:00
suspend_account_service_spec.rb	Add test for removing endorsed accounts on account deletion/suspension (#14241)	2020-07-07 02:01:13 +02:00
unallow_domain_service_spec.rb	Fix various warnings in rspec (#14729)	2020-09-04 20:22:26 +02:00
unblock_domain_service_spec.rb
unblock_service_spec.rb
unfollow_service_spec.rb
unmute_service_spec.rb
update_account_service_spec.rb
verify_link_service_spec.rb