1
0
mirror of https://github.com/funamitech/mastodon synced 2024-12-15 23:28:31 +09:00
YuruToot/app/models/trends
Claire 077e0c6812 Merge commit '0b4a3a04378ce43f2f314b9446b5053f6b374c6d' into glitch-soc/merge-upstream
Conflicts:
- `Gemfile.lock`:
  Conflict caused by the `json` gem thing once again.
  Updated as upstream did, but keeping the most recent `json` version.
- `spec/helpers/application_helper_spec.rb`:
  Upstream refactored a bunch of specs, including one place that differs
  because of glitch-soc's theming system.
  Refactored as upstream did, adapting it for glitch-soc's theming system.
2023-12-20 22:16:50 +01: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 Lint/RedundantSafeNavigation cop (#28172) 2023-12-01 15:52:56 +00:00
links.rb Change link previews to keep original URL from the status (#27312) 2023-11-13 09:58:28 +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 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 'a916251d8a8fffcaeb6be80eacf50138a53650dc' into glitch-soc/main 2023-12-17 15:32:29 +01: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