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 250ce1608d Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/lib/formatter.rb`: Upstream completely refactored the formatting code and removed that file, while glitch-soc had code for Markdown and HTML toots. Took upstream code, glitch-soc changes will be re-implemented on top of the refactored classes in a later commit. - `app/models/status.rb`: Upstream refactored status edit handling and moved code to `app/models/concerns/status_snapshot_concern.rb`. Applied glitch-soc's changes to that file. - `app/serializers/activitypub/note_serializer.rb`: Not really a conflict, just a line added too close to one modified by glitch-soc. Applied upstream changes while keeping the glitch-soc-modified one. - `app/services/update_status_service.rb`: Not really a conflict, upstream modified a line adjacent to one added by glitch-soc. Applied upstream changes while keeping the glitch-soc line. - `app/views/statuses/_simple_status.html.haml`: Upstream refactored formatting, glitch-soc changed the markup slightly. Applied upstream changes. - `spec/lib/formatter_spec.rb`: Upstream completely refactored the formatting code and removed that file, while glitch-soc had code for Markdown and HTML toots. Took upstream code, glitch-soc changes will be re-implemented on top of the refactored classes in a later commit.		3 years ago
..
base.rb	Add trending statuses (#17431)	3 years ago
history.rb	Add trending links (#16917)	3 years ago
links.rb	Add trending statuses (#17431)	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	Add offset pagination to trends in REST API (#17872)	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	Add option (on by default) to allow toots with content warnings to trend	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