This repository has been archived on 2024-07-22. You can view files and clone it, but cannot push or open issues or pull requests.

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	Merge branch 'master' into glitch-soc/merge-upstream	2020-04-02 20:32:00 +02:00
admin	Change deletes to preserve soft-deleted statuses in unresolved reports (#11805)	2019-09-11 16:32:44 +02:00
concerns	…
import	…
scheduler	Merge branch 'master' into glitch-soc/merge-upstream	2020-04-02 20:32:00 +02:00
web	Fix web push subscriptions being deleted on rate limit or timeout (#11826)	2019-09-13 19:15:47 +02:00
after_account_domain_block_worker.rb	…
authorize_follow_worker.rb	…
backup_worker.rb	Change local media attachments to perform heavy processing asynchronously (#13210)	2020-03-08 23:56:18 +01:00
block_worker.rb	…
bootstrap_timeline_worker.rb	…
digest_mailer_worker.rb	…
distribution_worker.rb	…
domain_block_worker.rb	Add domain block notes (#11515)	2019-08-07 20:20:23 +02:00
feed_insert_worker.rb	Use a redis-cached feed for the DM timeline	2019-06-27 16:44:12 +02:00
fetch_reply_worker.rb	…
import_worker.rb	…
link_crawl_worker.rb	…
local_notification_worker.rb	…
merge_worker.rb	…
move_worker.rb	Fix various issues with account migration (#12301)	2019-11-07 09:05:07 +02:00
mute_worker.rb	…
poll_expiration_notify_worker.rb	Fix background jobs not using locks like they are supposed to (#13361)	2020-03-31 21:59:03 +02:00
post_process_media_worker.rb	Change local media attachments to perform heavy processing asynchronously (#13210)	2020-03-08 23:56:18 +01:00
publish_announcement_reaction_worker.rb	Add streaming API updates for announcements being modified or deleted (#12963)	2020-01-26 20:07:26 +01:00
publish_scheduled_announcement_worker.rb	Add publish/unpublish controls to announcements in admin UI (#12967)	2020-01-27 11:05:33 +01:00
publish_scheduled_status_worker.rb	Fix background jobs not using locks like they are supposed to (#13361)	2020-03-31 21:59:03 +02:00
push_conversation_worker.rb	…
push_update_worker.rb	…
redownload_media_worker.rb	Add retry for failed media downloads and `tootctl media refresh` (#11775)	2019-09-10 15:29:12 +02:00
refollow_worker.rb	Fix RefollowWorker not keeping show_reblogs setting (#12707)	2020-01-02 20:52:39 +01:00
regeneration_worker.rb	Fix background jobs not using locks like they are supposed to (#13361)	2020-03-31 21:59:03 +02:00
removal_worker.rb	Add soft delete for statuses for instant deletes through API (#11623)	2019-08-22 21:55:56 +02:00
resolve_account_worker.rb	Fix background jobs not using locks like they are supposed to (#13361)	2020-03-31 21:59:03 +02:00
thread_resolve_worker.rb	…
unfavourite_worker.rb	…
unfollow_follow_worker.rb	Fix various issues with account migration (#12301)	2019-11-07 09:05:07 +02:00
unmerge_worker.rb	…
unpublish_announcement_worker.rb	Add streaming API updates for announcements being modified or deleted (#12963)	2020-01-26 20:07:26 +01:00
verify_account_links_worker.rb	Fix background jobs not using locks like they are supposed to (#13361)	2020-03-31 21:59:03 +02:00