1
0
mirror of https://github.com/funamitech/mastodon synced 2024-12-12 21:59:04 +09:00
YuruToot/spec/models/concerns
Claire 360590ecd8 Merge commit 'a3902997440c71f161e392f1ad6c5cdcf6aba95d' into glitch-soc/merge-upstream
Conflicts:
- `app/controllers/accounts_controller.rb`:
  Conflict due to glitch-soc's local-only posting feature.
  Refactored as upstream did but kept local changes.
- `app/lib/account_statuses_filter.rb`:
  Conflict due to glitch-soc's local-only posting feature.
  Refactored as upstream did but kept local changes.
2024-05-01 19:30:41 +02:00
..
account Merge commit 'a3902997440c71f161e392f1ad6c5cdcf6aba95d' into glitch-soc/merge-upstream 2024-05-01 19:30:41 +02:00
status Model concerns organization into module namespaces (#28149) 2023-12-01 11:00:41 +00:00
remotable_spec.rb Fix Performance/StringIdentifierArgument cop (#28399) 2023-12-18 10:26:09 +00:00