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 ad9329502a Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/javascript/packs/admin.js`: Conflicts due to glitch-soc's theming system. Upstream changes have been ported to `app/javascript/core/admin.js` - `app/models/trends/statuses.rb`: Minor conflict due to glitch-soc's option to allow CWed toots in trends. Ported upstream changes.		3 years ago
..
base.rb	Change trending statuses to only show one status from each account (#18181)	3 years ago
history.rb	Add trending links (#16917)	3 years ago
links.rb	Change trending statuses to only show one status from each account (#18181)	3 years ago
preview_card_batch.rb	Add trending statuses (#17431)	3 years ago
preview_card_filter.rb	Add trending statuses (#17431)	3 years ago
preview_card_provider_batch.rb	Add trending statuses (#17431)	3 years ago
preview_card_provider_filter.rb	Add trending statuses (#17431)	3 years ago
query.rb	Fix trends returning less results per page when filtered in REST API (#17996)	3 years ago
status_batch.rb	Add trending statuses (#17431)	3 years ago
status_filter.rb	Add trending statuses (#17431)	3 years ago
statuses.rb	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
tag_batch.rb	Add trending statuses (#17431)	3 years ago
tag_filter.rb	Add trending statuses (#17431)	3 years ago
tags.rb	Change trending statuses to only show one status from each account (#18181)	3 years ago