Thibaut Girka 78ac246b87 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: Gemfile Solved conflicts by using upstream's line for posix-spawn		2018-05-16 21:52:38 +02:00
..
activitypub	Raise Mastodon::RaceConditionError if Redis lock failed (#7511)	2018-05-16 12:29:45 +02:00
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	…
block_domain_from_account_service.rb	…
block_domain_service.rb	…
block_service.rb	…
bootstrap_timeline_service.rb	…
fan_out_on_write_service.rb	Store home feeds for 7 days instead of 14 (#7354)	2018-05-05 00:54:24 +02:00
favourite_service.rb	Remove most behaviour disparities between blocks and mutes (#7231)	2018-05-02 15:50:20 +02:00
fetch_atom_service.rb	…
fetch_link_card_service.rb	Raise Mastodon::RaceConditionError if Redis lock failed (#7511)	2018-05-16 12:29:45 +02:00
fetch_oembed_service.rb	Slightly reduce RAM usage (#7301)	2018-05-02 18:58:48 +02:00
fetch_remote_account_service.rb	…
fetch_remote_status_service.rb	…
follow_service.rb	…
mute_service.rb	Keep notification when muting_notifications is true (#7311)	2018-05-02 16:14:51 +02:00
notify_service.rb	Add REST API for Web Push Notifications subscriptions (#7445)	2018-05-11 11:49:12 +02:00
post_status_service.rb	Merge branch 'master' into glitch-soc/merge	2018-05-14 20:51:50 +02:00
precompute_feed_service.rb	…
process_feed_service.rb	…
process_hashtags_service.rb	…
process_interaction_service.rb	…
process_mentions_service.rb	Improve PostStatusService performance (#7317)	2018-05-02 22:10:57 +02:00
reblog_service.rb	…
reject_follow_service.rb	…
remove_status_service.rb	…
report_service.rb	…
resolve_account_service.rb	Raise Mastodon::RaceConditionError if Redis lock failed (#7511)	2018-05-16 12:29:45 +02:00
resolve_url_service.rb	…
search_service.rb	…
send_interaction_service.rb	…
subscribe_service.rb	…
suspend_account_service.rb	…
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	Fix custom emoji handling in UpdateRemoteProfileService (OStatus) (#7501)	2018-05-15 16:03:34 +02:00
verify_salmon_service.rb	…