Thibaut Girka 249991c498 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - Gemfile.lock - app/controllers/accounts_controller.rb - app/controllers/admin/dashboard_controller.rb - app/controllers/follower_accounts_controller.rb - app/controllers/following_accounts_controller.rb - app/controllers/remote_follow_controller.rb - app/controllers/stream_entries_controller.rb - app/controllers/tags_controller.rb - app/javascript/packs/public.js - app/lib/sanitize_config.rb - app/models/account.rb - app/models/form/admin_settings.rb - app/models/media_attachment.rb - app/models/stream_entry.rb - app/models/user.rb - app/serializers/initial_state_serializer.rb - app/services/batched_remove_status_service.rb - app/services/post_status_service.rb - app/services/process_mentions_service.rb - app/services/reblog_service.rb - app/services/remove_status_service.rb - app/views/admin/settings/edit.html.haml - config/locales/simple_form.pl.yml - config/settings.yml - docker-compose.yml		2019-07-19 18:26:49 +02:00
..
backup_cleanup_scheduler.rb
doorkeeper_cleanup_scheduler.rb
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
media_cleanup_scheduler.rb
pghero_scheduler.rb
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
subscriptions_scheduler.rb	Remove Salmon and PubSubHubbub (#11205)	2019-07-06 23:26:16 +02:00
user_cleanup_scheduler.rb