Thibaut Girka 83774367d2 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/javascript/mastodon/features/compose/components/poll_form.js` conflict because of the poll option limit being different than upstream's		2019-11-07 13:43:56 +01:00
..
activitypub
concerns
account_search_service.rb	Add abilityto add oneself to lists (#12271)	2019-11-04 13:02:01 +01:00
after_block_domain_from_account_service.rb
after_block_service.rb
app_sign_up_service.rb	Add reason param to POST /api/v1/accounts REST API (#12064)	2019-10-03 17:50:59 +02:00
authorize_follow_service.rb	Remove Salmon and PubSubHubbub (#11205)	2019-07-06 23:26:16 +02:00
backup_service.rb
base_service.rb
batched_remove_status_service.rb
block_domain_service.rb
block_service.rb
bootstrap_timeline_service.rb	Fix BootstrapTimelineService crashing when bootstrapped accounts are invalid (#12037)	2019-10-01 15:10:00 +02:00
fan_out_on_write_service.rb
favourite_service.rb
fetch_link_card_service.rb	microformat mentions can have an implicit property (#12189)	2019-10-24 22:46:15 +02:00
fetch_oembed_service.rb
fetch_remote_account_service.rb
fetch_remote_status_service.rb
fetch_resource_service.rb
follow_service.rb	Fix various issues with account migration (#12301)	2019-11-07 09:05:07 +02:00
hashtag_query_service.rb	Fix hashtag timeline REST API accepting too many hashtags (#12091)	2019-10-07 03:56:21 +02:00
import_service.rb
move_service.rb
mute_service.rb
notify_service.rb
post_status_service.rb
precompute_feed_service.rb
process_hashtags_service.rb
process_mentions_service.rb
reblog_service.rb
reject_follow_service.rb
remove_status_service.rb
report_service.rb
resolve_account_service.rb
resolve_url_service.rb
search_service.rb
suspend_account_service.rb
tag_search_service.rb
unallow_domain_service.rb
unblock_domain_service.rb
unblock_service.rb
unfavourite_service.rb
unfollow_service.rb
unmute_service.rb
update_account_service.rb	Fix follow requests N+1 (#12004)	2019-09-30 17:02:03 +02:00
verify_link_service.rb
vote_service.rb	Add voters count support (#11917)	2019-09-29 22:58:01 +02:00