mastodon-glitch/spec/models/concerns
Claire 30ee7339d3 Merge commit '7d9b209fe84b00eff348ea9d54905cbfffa79788' into glitch-soc/merge-upstream
Conflicts:
- `app/models/form/admin_settings.rb`:
  Upstream changed code style change, including on a line modified by glitch-soc.
  Kept glitch-soc's line but with the code style change applied.
2023-12-21 19:31:12 +01:00
..
account Merge commit '272592d16d40e804ec325ef3b5e6de9bbad5f2dd' into glitch-soc/merge-upstream 2023-12-20 22:05:31 +01: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