Thibaut Girka 444796b69b Merge branch 'master' into glitch-soc/merge-upstream ...

Conflicts:
- app/controllers/application_controller.rb
- app/controllers/auth/confirmations_controller.rb
- app/controllers/auth/sessions_controller.rb
- app/controllers/settings/deletes_controller.rb
- app/controllers/settings/two_factor_authentication/recovery_codes_controller.rb

2019-07-23 10:51:07 +02:00

..

backup_cleanup_scheduler.rb

Disable retries on all scheduled tasks (#8413)

2018-08-25 13:28:07 +02:00

doorkeeper_cleanup_scheduler.rb

Disable retries on all scheduled tasks (#8413)

2018-08-25 13:28:07 +02:00

email_scheduler.rb

Improve e-mail digest (#9689)

2019-01-02 10:47:32 +01:00

feed_cleanup_scheduler.rb

Use a redis-cached feed for the DM timeline

2019-06-27 16:44:12 +02:00

ip_cleanup_scheduler.rb

Disable retries on all scheduled tasks (#8413)

2018-08-25 13:28:07 +02:00

media_cleanup_scheduler.rb

Disable retries on all scheduled tasks (#8413)

2018-08-25 13:28:07 +02:00

pghero_scheduler.rb

Track historical space stats in PgHero to determine PostgreSQL growth (#8906)

2018-10-09 19:35:14 +02:00

preview_cards_cleanup_scheduler.rb

Add periodic removal of older thumbnails for preview cards (#11304)

2019-07-15 07:50:14 +02:00

scheduled_statuses_scheduler.rb

Fix PublishScheduledStatusWorker being queued with no arguments (#9724)

2019-01-06 09:21:16 +01:00

subscriptions_cleanup_scheduler.rb

Remove WebSub subscriptions (#11303)

2019-07-21 04:08:00 +02:00

subscriptions_scheduler.rb

Remove Salmon and PubSubHubbub (#11205)

2019-07-06 23:26:16 +02:00

user_cleanup_scheduler.rb

Disable retries on all scheduled tasks (#8413)

2018-08-25 13:28:07 +02:00