Claire 392ca0472a Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/javascript/packs/admin.js`: Conflicts due to glitch-soc's theming system. Upstream changes have been ported to `app/javascript/core/admin.js` - `app/models/trends/statuses.rb`: Minor conflict due to glitch-soc's option to allow CWed toots in trends. Ported upstream changes.		2022-05-01 16:52:27 +02:00
..
trends	Add trending links (#16917)	2021-11-25 13:07:38 +01:00
accounts_statuses_cleanup_scheduler.rb	Fix single Redis connection being used across all threads (#18135)	2022-04-28 17:47:34 +02:00
backup_cleanup_scheduler.rb	Fix configuration for sidekiq-unique-jobs after 7.x upgrade (#15908)	2021-03-15 11:17:43 +01:00
doorkeeper_cleanup_scheduler.rb	Fix configuration for sidekiq-unique-jobs after 7.x upgrade (#15908)	2021-03-15 11:17:43 +01:00
email_scheduler.rb	Fix configuration for sidekiq-unique-jobs after 7.x upgrade (#15908)	2021-03-15 11:17:43 +01:00
feed_cleanup_scheduler.rb	Merge branch 'main' into glitch-soc/merge-upstream	2021-03-15 11:26:59 +01:00
follow_recommendations_scheduler.rb	Add trending statuses (#17431)	2022-02-25 00:34:14 +01:00
instance_refresh_scheduler.rb	Fix configuration for sidekiq-unique-jobs after 7.x upgrade (#15908)	2021-03-15 11:17:43 +01:00
ip_cleanup_scheduler.rb	Change authorized applications page (#17656)	2022-03-01 16:48:58 +01:00
media_cleanup_scheduler.rb	Fix configuration for sidekiq-unique-jobs after 7.x upgrade (#15908)	2021-03-15 11:17:43 +01:00
pghero_scheduler.rb	Fix configuration for sidekiq-unique-jobs after 7.x upgrade (#15908)	2021-03-15 11:17:43 +01:00
scheduled_statuses_scheduler.rb	Fix configuration for sidekiq-unique-jobs after 7.x upgrade (#15908)	2021-03-15 11:17:43 +01:00
user_cleanup_scheduler.rb	Fix clean_discarded_statuses (#17822)	2022-03-19 09:24:08 +01:00