David Yip 1b8fcd4df5 Merge remote-tracking branch 'origin/master' into merge-upstream ... Conflicts: README.md app/controllers/follower_accounts_controller.rb app/controllers/following_accounts_controller.rb app/serializers/rest/instance_serializer.rb app/views/stream_entries/_simple_status.html.haml config/locales/simple_form.ja.yml		2018-03-02 21:46:44 -06:00
..
activitypub	…
pubsubhubbub	…
account_search_service_spec.rb	Rename ResolveRemoteAccountService to ResolveAccountService (#6327)	2018-01-22 14:25:09 +01:00
after_block_service_spec.rb	…
authorize_follow_service_spec.rb	…
batched_remove_status_service_spec.rb	…
block_domain_from_account_service_spec.rb	…
block_domain_service_spec.rb	…
block_service_spec.rb	…
bootstrap_timeline_service_spec.rb	…
fan_out_on_write_service_spec.rb	…
favourite_service_spec.rb	…
fetch_atom_service_spec.rb	Added #call spec (#6455)	2018-02-10 03:31:38 +01:00
fetch_link_card_service_spec.rb	Fix URLs incorrectly having trailing hyphen removed (#6465)	2018-02-11 23:49:18 +01:00
fetch_remote_account_service_spec.rb	Added FetchRemoteAccountService spec (#6456)	2018-02-10 17:10:57 +01:00
fetch_remote_status_service_spec.rb	Added fetch_remote_status_service call spec case actibitypub (#6500)	2018-02-18 16:34:03 +01:00
follow_service_spec.rb	…
mute_service_spec.rb	…
notify_service_spec.rb	…
post_status_service_spec.rb	…
precompute_feed_service_spec.rb	Do not push status to feed if its reblog is already inserted (#6488)	2018-02-24 05:40:18 +01:00
process_feed_service_spec.rb	…
process_interaction_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	Federated reports (#6570)	2018-02-28 06:54:55 +01:00
resolve_account_service_spec.rb	Rename ResolveRemoteAccountService to ResolveAccountService (#6327)	2018-01-22 14:25:09 +01:00
resolve_url_service_spec.rb	Rename FetchRemoteResourceService to ResolveURLService (#6328)	2018-01-22 14:24:22 +01:00
search_service_spec.rb	Rename FetchRemoteResourceService to ResolveURLService (#6328)	2018-01-22 14:24:22 +01:00
send_interaction_service_spec.rb	…
subscribe_service_spec.rb	…
suspend_account_service_spec.rb	…
unblock_domain_service_spec.rb	…
unblock_service_spec.rb	…
unfollow_service_spec.rb	…
unmute_service_spec.rb	…
unsubscribe_service_spec.rb	…
update_remote_profile_service_spec.rb	…