9 commits

Author	SHA1	Message	Date
Jeremy Kescher	9fe04326ea	Merge remote-tracking branch 'upstream/main' into develop ... # Conflicts: # .github/workflows/build-image.yml # config/routes.rb # db/schema.rb # lib/mastodon/version.rb	2023-05-09 23:26:00 +02:00
Claire	32a030dd74	Rewrite import feature (#21054)	2023-05-02 12:08:48 +02:00
Jeremy Kescher	7318b74ebf	Merge remote-tracking branch 'upstream/main' into develop ... # Conflicts: # Gemfile.lock # app/models/notification.rb # config/locales/simple_form.de.yml	2023-03-05 12:34:16 +01:00
Nick Schonning	84cc805cae	Enable Style/FrozenStringLiteralComment for specs (#23790)	2023-02-22 09:55:31 +09:00
Nick Schonning	4552685f6b	Autofix Rubocop RSpec/LeadingSubject (#23670)	2023-02-20 13:24:14 +09:00
Nick Schonning	5179c47087	Autofix Rubocops RSpec/ScatteredLet (#23725)	2023-02-20 11:17:41 +09:00
Jeremy Kescher	8a24bef2e3	Fix Redis warnings regarding version 5.0.0	2022-12-04 22:35:48 +01:00
Eugen Rochko	bf0ab3e0fa	Fix vacuum scheduler missing lock, locks never expiring (#19458) ... Remove vacuuming of orphaned preview cards	2022-10-26 12:10:48 +02:00
Eugen Rochko	5c9abdeff1	Add retention policy for cached content and media (#19232)	2022-09-27 03:08:19 +02:00