You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

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.		5 years ago
..
activitypub	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
admin	…
concerns	…
import	…
scheduler	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
web	…
after_account_domain_block_worker.rb	…
authorize_follow_worker.rb	…
backup_worker.rb	Change local media attachments to perform heavy processing asynchronously (#13210)	5 years ago
block_worker.rb	…
bootstrap_timeline_worker.rb	…
digest_mailer_worker.rb	…
distribution_worker.rb	…
domain_block_worker.rb	…
feed_insert_worker.rb	…
fetch_reply_worker.rb	…
import_worker.rb	…
link_crawl_worker.rb	…
local_notification_worker.rb	…
merge_worker.rb	…
move_worker.rb	…
mute_worker.rb	…
poll_expiration_notify_worker.rb	Fix background jobs not using locks like they are supposed to (#13361)	5 years ago
post_process_media_worker.rb	Change local media attachments to perform heavy processing asynchronously (#13210)	5 years ago
publish_announcement_reaction_worker.rb	Add streaming API updates for announcements being modified or deleted (#12963)	5 years ago
publish_scheduled_announcement_worker.rb	Add publish/unpublish controls to announcements in admin UI (#12967)	5 years ago
publish_scheduled_status_worker.rb	Fix background jobs not using locks like they are supposed to (#13361)	5 years ago
push_conversation_worker.rb	…
push_update_worker.rb	…
redownload_media_worker.rb	…
refollow_worker.rb	…
regeneration_worker.rb	Fix background jobs not using locks like they are supposed to (#13361)	5 years ago
removal_worker.rb	…
resolve_account_worker.rb	Fix background jobs not using locks like they are supposed to (#13361)	5 years ago
thread_resolve_worker.rb	…
unfavourite_worker.rb	…
unfollow_follow_worker.rb	…
unmerge_worker.rb	…
unpublish_announcement_worker.rb	Add streaming API updates for announcements being modified or deleted (#12963)	5 years ago
verify_account_links_worker.rb	Fix background jobs not using locks like they are supposed to (#13361)	5 years ago