Claire 59864ff495 Merge branch 'main' into glitch-soc/merge-upstream ...

Conflicts:
- `.github/dependabot.yml`:
  Upstream modified it, but we deleted it in glitch-soc.
  Keep it deleted.

2022-03-22 17:00:38 +01:00

..

trends

Add trending links (#16917)

2021-11-25 13:07:38 +01:00

accounts_statuses_cleanup_scheduler.rb

Fix Ruby 2.5 incompatibility (#17465)

2022-02-07 19:57:06 +01:00

backup_cleanup_scheduler.rb

…

doorkeeper_cleanup_scheduler.rb

…

email_domain_block_refresh_scheduler.rb

Fix crash in EmailDomainBlockRefreshScheduler (#17649)

2022-02-26 16:28:28 +01:00

email_scheduler.rb

…

feed_cleanup_scheduler.rb

…

follow_recommendations_scheduler.rb

Add trending statuses (#17431)

2022-02-25 00:34:14 +01:00

instance_refresh_scheduler.rb

…

ip_cleanup_scheduler.rb

Change authorized applications page (#17656)

2022-03-01 16:48:58 +01:00

media_cleanup_scheduler.rb

…

pghero_scheduler.rb

…

scheduled_statuses_scheduler.rb

…

user_cleanup_scheduler.rb

Fix clean_discarded_statuses (#17822)

2022-03-19 09:24:08 +01:00