mastodon/spec/presenters
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_relationships_presenter_spec.rb Fix call to inefficient `delete_matched` cache method in domain blocks (#28374) 2023-12-18 16:14:43 +00:00
familiar_followers_presenter_spec.rb Reduce expectations for `RSpec/MultipleExpectations` cop in `spec/presenters` specs (#27881) 2023-11-16 14:37:52 +00:00
instance_presenter_spec.rb Merge branch 'main' into glitch-soc/merge-upstream 2023-03-16 23:12:59 +01:00
status_relationships_presenter_spec.rb Reduce expectations for `RSpec/MultipleExpectations` cop in `spec/presenters` specs (#27881) 2023-11-16 14:37:52 +00:00