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.

Claire 179f1d3a78 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/views/admin/pending_accounts/index.html.haml`: Removed upstream, while it had glitch-soc-specific changes to accomodate for glitch-soc's theming system. Removed the file. Additional changes: - `app/views/admin/accounts/index.html.haml': Accomodate for glitch-soc's theming system.		3 years ago
..
trends	Add trending links (#16917)	3 years ago
accounts_statuses_cleanup_scheduler.rb	Add feature to automatically delete old toots (#16529)	3 years ago
backup_cleanup_scheduler.rb	Fix configuration for sidekiq-unique-jobs after 7.x upgrade (#15908)	4 years ago
doorkeeper_cleanup_scheduler.rb	Fix configuration for sidekiq-unique-jobs after 7.x upgrade (#15908)	4 years ago
email_scheduler.rb	Fix configuration for sidekiq-unique-jobs after 7.x upgrade (#15908)	4 years ago
feed_cleanup_scheduler.rb	Merge branch 'main' into glitch-soc/merge-upstream	4 years ago
follow_recommendations_scheduler.rb	Fix follow recommendation biased towards older accounts (#17126)	3 years ago
instance_refresh_scheduler.rb	Fix configuration for sidekiq-unique-jobs after 7.x upgrade (#15908)	4 years ago
ip_cleanup_scheduler.rb	Add authentication history (#16408)	3 years ago
media_cleanup_scheduler.rb	Fix configuration for sidekiq-unique-jobs after 7.x upgrade (#15908)	4 years ago
pghero_scheduler.rb	Fix configuration for sidekiq-unique-jobs after 7.x upgrade (#15908)	4 years ago
scheduled_statuses_scheduler.rb	Fix configuration for sidekiq-unique-jobs after 7.x upgrade (#15908)	4 years ago
user_cleanup_scheduler.rb	Fix configuration for sidekiq-unique-jobs after 7.x upgrade (#15908)	4 years ago