Claire 443ec4f8ba Merge branch 'main' into glitch-soc/merge-upstream ...

Conflicts:
- `app/views/admin/tags/index.html.haml`:
  Removed upstream while it had changes in glitch-soc to accomodate for the
  theming system.

Additional changes to accomodate for the theming system:
- `app/views/admin/trends/links/preview_card_providers/index.html.haml`
- `app/views/admin/trends/links/index.html.haml`
- `app/views/admin/trends/tags/index.html.haml`
- `app/views/admin/tags/show.html.haml`

2021-11-25 23:50:35 +01:00

..

trends

Add trending links (#16917)

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

accounts_statuses_cleanup_scheduler.rb

Add feature to automatically delete old toots (#16529)

2021-08-09 23:11:50 +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

Improve performance of follow recommendation scheduler (#16159)

2021-05-05 22:04:52 +02: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

Add authentication history (#16408)

2021-06-21 17:07:30 +02: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 configuration for sidekiq-unique-jobs after 7.x upgrade (#15908)

2021-03-15 11:17:43 +01:00