Claire 9ae60f8738 Merge commit '82e477b184b5666fff7fb55933dce22ca2925db8' into glitch-soc/merge-upstream ...

Conflicts:
- `db/migrate/20180831171112_create_bookmarks.rb`:
  Upstream ran a lint fix on this file, but this file is different in
  glitch-soc because the feature was added much earlier.
  Ran the lint fix on our own version of the file.

2023-07-12 16:03:05 +02:00

..

base.rb

Add support for language preferences for trending statuses and links (#18288)

2022-10-08 16:45:40 +02:00

history.rb

Fix Performance/Sum cop (#24788)

2023-05-02 16:10:40 +02:00

links.rb

Fix trend calculation working on too many items at a time (#25835)

2023-07-08 20:16:48 +02: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

Fix error when passing unknown filter param in REST API (#20626)

2022-11-14 08:06:06 +01:00

query.rb

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

2023-07-12 14:19:20 +02: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 '610cf6c3713e414995ea1a57110db400ccb88dd2' into glitch-soc/merge-upstream

2023-07-12 15:38:35 +02:00

tag_batch.rb

Add trending statuses (#17431)

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

tag_filter.rb

Autofix Rubocop Style/RedundantBegin (#23703)

2023-02-19 07:09:40 +09:00

tags.rb

Autofix Rubocop Style/RedundantBegin (#23703)

2023-02-19 07:09:40 +09:00