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.		4 years ago
..
backup_cleanup_scheduler.rb	Fix background jobs not using locks like they are supposed to (#13361)	4 years ago
doorkeeper_cleanup_scheduler.rb	Fix background jobs not using locks like they are supposed to (#13361)	4 years ago
email_scheduler.rb	Fix background jobs not using locks like they are supposed to (#13361)	4 years ago
feed_cleanup_scheduler.rb	Merge branch 'master' into glitch-soc/merge-upstream	4 years ago
ip_cleanup_scheduler.rb	Fix background jobs not using locks like they are supposed to (#13361)	4 years ago
media_cleanup_scheduler.rb	Fix background jobs not using locks like they are supposed to (#13361)	4 years ago
pghero_scheduler.rb	Fix background jobs not using locks like they are supposed to (#13361)	4 years ago
scheduled_statuses_scheduler.rb	Fix background jobs not using locks like they are supposed to (#13361)	4 years ago
trending_tags_scheduler.rb	Fix background jobs not using locks like they are supposed to (#13361)	4 years ago
user_cleanup_scheduler.rb	Fix background jobs not using locks like they are supposed to (#13361)	4 years ago