Claire 06b1f8bd85 Merge commit '8224178e8ca9746f97ce341179d2c636fa22a082' into glitch-soc/merge-upstream ...

Conflicts:
- `app/models/trends/statuses.rb`:
  Upstream added a condition where glitch-soc had changes on the same line.
  Adapted upstream's changes.

2025-06-02 20:05:43 +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

Fix Lint/RedundantSafeNavigation cop (#28172)

2023-12-01 15:52:56 +00:00

links.rb

Update rubocop to version 1.75.0 (#34283)

2025-03-27 07:48:19 +00: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

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

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 commit '8224178e8ca9746f97ce341179d2c636fa22a082' into glitch-soc/merge-upstream

2025-06-02 20:05:43 +02:00

tag_batch.rb

Add trending statuses (#17431)

2022-02-25 00:34:14 +01:00

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