Claire 67ca8bb56a Merge commit '8156113d58db851d00f8052e66459e6dafb71e82' into glitch-soc/merge-upstream ...

Conflicts:
- `app/javascript/packs/admin.jsx`:
  Change applied to `app/javascript/core/admin.js` instead.

2024-02-26 17:43:16 +01:00

..

base.rb

…

history.rb

Fix Lint/RedundantSafeNavigation cop (#28172)

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

links.rb

Add RankedTrend concern for trends classes (#29388)

2024-02-26 13:45:39 +00:00

preview_card_batch.rb

…

preview_card_filter.rb

Fix Performance/CollectionLiteralInLoop cop (#24819)

2023-05-04 05:33:55 +02:00

preview_card_provider_batch.rb

…

preview_card_provider_filter.rb

…

query.rb

Refactor Trends::Query to avoid brakeman sql injection warnings (#25881)

2023-07-12 14:19:20 +02:00

status_batch.rb

…

status_filter.rb

Fix Performance/CollectionLiteralInLoop cop (#24819)

2023-05-04 05:33:55 +02:00

statuses.rb

Merge commit '8156113d58db851d00f8052e66459e6dafb71e82' into glitch-soc/merge-upstream

2024-02-26 17:43:16 +01:00

tag_batch.rb

…

tag_filter.rb

…

tags.rb

…