Thibaut Girka f3eff922a3 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/javascript/mastodon/features/compose/components/poll_form.js`: Upstream bumped poll option character limit, but we already had a higher one, kept ours. - `app/validators/poll_validator.rb`: Upstream bumped poll option character limit, but we already had a higher one, kept ours. - `config/initializers/content_security_policy.rb`: Upstream added a rule, the way we compute ours is different, but that added rule has been ported. - `package.json`: No real conflict, dependency update. Performed the same update. - `yarn.lock`: No real conflict, dependency update. Performed the same update.		2020-04-02 20:32:00 +02:00
..
activitypub	Add federation support for the "hide network" preference (#11673)	2020-03-09 00:10:29 +01:00
concerns
account_search_service.rb	Fix error when searching for URLs that contain the mention syntax (#13151)	2020-03-08 15:42:20 +01:00
after_block_domain_from_account_service.rb
after_block_service.rb
app_sign_up_service.rb
authorize_follow_service.rb
backup_service.rb	Merge branch 'master' into glitch-soc/merge-upstream	2020-02-25 14:28:13 +01:00
base_service.rb
batched_remove_status_service.rb
block_domain_service.rb
block_service.rb
bootstrap_timeline_service.rb
fan_out_on_write_service.rb
favourite_service.rb
fetch_link_card_service.rb
fetch_oembed_service.rb
fetch_remote_status_service.rb
fetch_resource_service.rb	Fix some timeouts when searching URLs by limiting some database queries (#13253)	2020-03-12 23:06:43 +01:00
follow_service.rb	Add specific rate limits for posting and following (#13172)	2020-03-08 15:17:39 +01:00
hashtag_query_service.rb
import_service.rb	Fix incorrect deletion of local accounts imported by overwriting (#13350)	2020-03-30 20:32:34 +02:00
move_service.rb
mute_service.rb
notify_service.rb
post_status_service.rb	Fix crash when posting with a CW but no text nor media	2020-03-27 22:28:39 +01:00
precompute_feed_service.rb
process_hashtags_service.rb
process_mentions_service.rb
reblog_service.rb	Merge branch 'master' into glitch-soc/merge-upstream	2020-03-08 19:38:53 +01:00
reject_follow_service.rb
remove_status_service.rb
report_service.rb
resolve_account_service.rb
resolve_url_service.rb	Fix some timeouts when searching URLs by limiting some database queries (#13253)	2020-03-12 23:06:43 +01:00
search_service.rb	Fix returning results when searching for URL with non-zero offset (#13377)	2020-04-02 03:39:37 +02:00
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
verify_link_service.rb
vote_service.rb