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
..
delivery_worker.rb	Suppress backtrace when delivering toots (#12798)	5 years ago
distribute_poll_update_worker.rb	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
distribution_worker.rb	Refactor all ActivityPub deliveries to be serialized and signed through one concern (#10966)	6 years ago
fetch_replies_worker.rb	Do not error out on unsalvageable errors in FetchRepliesService (#10175)	6 years ago
low_priority_delivery_worker.rb	…
move_distribution_worker.rb	Fixed missing account in MoveDistributionWorker (#11906)	5 years ago
post_upgrade_worker.rb	…
processing_worker.rb	Do not retry processing ActivityPub jobs raising validation errors (#10614)	6 years ago
raw_distribution_worker.rb	…
reply_distribution_worker.rb	Refactor all ActivityPub deliveries to be serialized and signed through one concern (#10966)	6 years ago
synchronize_featured_collection_worker.rb	Fix background jobs not using locks like they are supposed to (#13361)	5 years ago
update_distribution_worker.rb	Refactor all ActivityPub deliveries to be serialized and signed through one concern (#10966)	6 years ago