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 ff73d43b35 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `Gemfile.lock`: Not a real conflict, just an upstream dependency udpated textually too close to a glitch-soc-only dependency. Updated dependencies like upstream. - `app/controllers/settings/preferences_controller.rb`: Upstream added settings where we had extra glitch-soc-specific settings. Added upstream's new settings. - `app/models/user.rb`: Upstream added settings where we had extra glitch-soc-specific settings. Added upstream's new settings. - `config/i18n-tasks.yml`: Not a real conflict, just a new upstream line too textually close to a glitch-soc-only line. Ported upstream's change.		3 years ago
..
base.rb	Fix dangling language-specific trends (#17997)	3 years ago
history.rb	Add trending links (#16917)	3 years ago
links.rb	Fix dangling language-specific trends (#17997)	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	Add trending statuses (#17431)	3 years ago