1
0
mirror of https://github.com/funamitech/mastodon synced 2024-12-14 14:49:01 +09:00
YuruToot/app/models/concerns/status
Claire 016d194274 Merge commit '2fe1b8d1695d8faa452a69872fde94ccc4611576' into glitch-soc/merge-upstream
Conflicts:
- `app/helpers/application_helper.rb`:
  Not a real conflict, upstream added helpers right next to glitch-soc only
  helpers.
  Added upstream's helpers.
- `spec/models/status_spec.rb`:
  Not a real conflict, upstream added specs right next to glitch-soc only
  specs.
  Added upstream's tests.
2024-05-06 17:53:51 +02:00
..
safe_reblog_insert.rb Model concerns organization into module namespaces (#28149) 2023-12-01 11:00:41 +00:00
search_concern.rb Use enum-generated public_visibility scope on Status (#28156) 2024-03-14 09:31:57 +00:00
snapshot_concern.rb Merge commit '272592d16d40e804ec325ef3b5e6de9bbad5f2dd' into glitch-soc/merge-upstream 2023-12-20 22:05:31 +01:00
threading_concern.rb Add API to get multiple accounts and statuses (#27871) 2024-05-06 15:19:15 +00:00