Thibaut Girka 0437d70628 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/follower_accounts_controller.rb`: Conflict due to upstream changing suspension logic while glitch-soc has an extra option to hide followers count. Ported upstream changes.		2020-11-08 14:20:35 +01:00
..
activitypub	Add support for reversible suspensions through ActivityPub (#14989)	2020-11-08 00:28:39 +01:00
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	…
delete_account_service_spec.rb	…
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	…
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	Add support for reversible suspensions through ActivityPub (#14989)	2020-11-08 00:28:39 +01:00
resolve_url_service_spec.rb	…
search_service_spec.rb	…
unallow_domain_service_spec.rb	…
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	…