You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
mastodon/spec/presenters
Claire fe5f6bc7ed Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `.github/workflows/build-image.yml`:
  Fix erroneous deletion in a previous merge.
- `Gemfile`:
  Conflict caused by glitch-soc-only hCaptcha dependency
- `app/controllers/auth/sessions_controller.rb`:
  Minor conflict due to glitch-soc's theming system.
- `app/controllers/filters_controller.rb`:
  Minor conflict due to glitch-soc's theming system.
- `app/serializers/rest/status_serializer.rb`:
  Minor conflict due to glitch-soc having an extra `local_only` property
3 years ago
..
account_relationships_presenter_spec.rb
familiar_followers_presenter_spec.rb Add `/api/v1/accounts/familiar_followers` to REST API (#17700) 3 years ago
instance_presenter_spec.rb Change references to tootsuite/mastodon to mastodon/mastodon (#16491) 4 years ago
status_relationships_presenter_spec.rb Revamp post filtering system (#18058) 3 years ago