Claire fcb7917344 Merge commit '208cb8276ae618aa36aec5fad0dc31341402c133' into glitch-soc/merge-4.4 ...

Conflicts:
- `app/models/trends/statuses.rb`:
  Conflict because of glitch-soc's setting to allow CWs in trends.
  Kept glitch-soc's setting but followed upstream's refactor.

2025-08-04 21:48:37 +02:00

..

base.rb

Change hashtag trends to be stored in the database instead of redis (#32837)

2024-12-04 11:59:17 +00:00

history.rb

…

links.rb

Update rubocop to version 1.75.0 (#34283)

2025-03-27 07:48:19 +00:00

preview_card_batch.rb

…

preview_card_filter.rb

…

preview_card_provider_batch.rb

…

preview_card_provider_filter.rb

Add reviewed and unreviewed scopes to Reviewable model concern (#31988)

2024-09-20 08:51:37 +00:00

query.rb

Fix issue with trending order when user has chosen languages (#33557)

2025-01-13 14:27:30 +00:00

status_batch.rb

…

status_filter.rb

…

statuses.rb

Merge commit '208cb8276ae618aa36aec5fad0dc31341402c133' into glitch-soc/merge-4.4

2025-08-04 21:48:37 +02:00

tag_batch.rb

…

tag_filter.rb

Change hashtag trends to be stored in the database instead of redis (#32837)

2024-12-04 11:59:17 +00:00

tags.rb

Fix issue with trending order when user has chosen languages (#33557)

2025-01-13 14:27:30 +00:00