David Yip 3550470c18 Merge remote-tracking branch 'origin/master' into gs-master ... Conflicts: app/javascript/mastodon/locales/en.json app/javascript/mastodon/locales/ja.json app/javascript/mastodon/locales/pl.json The above conflicts appear to be a text conflict introduced by glitch-soc's additional level of columns (i.e. moving a bunch of columns under the Misc option). They were resolved via accept-ours.		2018-06-02 16:15:36 -05:00
..
activitypub	…
concerns	…
pubsubhubbub	…
account_search_service.rb	…
after_block_service.rb	…
authorize_follow_service.rb	…
backup_service.rb	…
base_service.rb	…
batched_remove_status_service.rb	Improve counter caches on Status and Account (#7644)	2018-05-30 02:50:23 +02:00
block_domain_from_account_service.rb	…
block_domain_service.rb	…
block_service.rb	…
bootstrap_timeline_service.rb	…
fan_out_on_write_service.rb	Reduce wasted work in RemoveStatusService due to inactive followers (#7672)	2018-05-29 22:55:33 +02:00
favourite_service.rb	…
fetch_atom_service.rb	…
fetch_link_card_service.rb	…
fetch_oembed_service.rb	…
fetch_remote_account_service.rb	…
fetch_remote_status_service.rb	…
follow_service.rb	…
mute_service.rb	…
notify_service.rb	…
post_status_service.rb	…
precompute_feed_service.rb	…
process_feed_service.rb	…
process_hashtags_service.rb	Exclude unlisted, private and direct toots from affecting trends (#7686)	2018-05-31 16:47:28 +02:00
process_interaction_service.rb	…
process_mentions_service.rb	…
reblog_service.rb	…
reject_follow_service.rb	…
remove_status_service.rb	Reduce wasted work in RemoveStatusService due to inactive followers (#7672)	2018-05-29 22:55:33 +02:00
report_service.rb	…
resolve_account_service.rb	…
resolve_url_service.rb	…
search_service.rb	…
send_interaction_service.rb	…
subscribe_service.rb	…
suspend_account_service.rb	Improve counter caches on Status and Account (#7644)	2018-05-30 02:50:23 +02:00
unblock_domain_service.rb	…
unblock_service.rb	…
unfavourite_service.rb	…
unfollow_service.rb	…
unmute_service.rb	…
unsubscribe_service.rb	…
update_account_service.rb	…
update_remote_profile_service.rb	…
verify_salmon_service.rb	…