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
..
base.rb	Fix Redis warnings regarding version 5.0.0	2022-12-04 22:35:48 +01:00
history.rb	Fix Performance/Sum cop (#24788)	2023-05-02 16:10:40 +02:00
links.rb	Autofix Rubocop Style/RedundantBegin (#23703)	2023-02-19 07:09:40 +09:00
preview_card_batch.rb	Add trending statuses (#17431)	2022-02-25 00:34:14 +01:00
preview_card_filter.rb	Fix Performance/CollectionLiteralInLoop cop (#24819)	2023-05-04 05:33:55 +02:00
preview_card_provider_batch.rb	Add trending statuses (#17431)	2022-02-25 00:34:14 +01:00
preview_card_provider_filter.rb	Fix error when passing unknown filter param in REST API (#20626)	2022-11-14 08:06:06 +01:00
query.rb	Fix trends returning less results per page when filtered in REST API (#17996)	2022-04-08 17:10:53 +02:00
status_batch.rb	Fix using wrong policy on status-related actions in admin UI (#19490)	2022-10-28 00:48:30 +02:00
status_filter.rb	Fix Performance/CollectionLiteralInLoop cop (#24819)	2023-05-04 05:33:55 +02:00
statuses.rb	Merge branch 'main' into glitch-soc/merge-upstream	2023-02-19 10:42:55 +01:00
tag_batch.rb	Add trending statuses (#17431)	2022-02-25 00:34:14 +01:00
tag_filter.rb	Autofix Rubocop Style/RedundantBegin (#23703)	2023-02-19 07:09:40 +09:00
tags.rb	Autofix Rubocop Style/RedundantBegin (#23703)	2023-02-19 07:09:40 +09:00