mastodon/app/controllers/api/v2
Claire 178e151019 Merge commit '55e7c08a83547424024bac311d5459cb82cf6dae' into glitch-soc/merge-upstream
Conflicts:
- `app/models/user_settings.rb`:
  Upstream added a constraint on a setting textually close
  to glitch-soc-only settings.
  Applied upstream's change.
- `lib/sanitize_ext/sanitize_config.rb`:
  Upstream added support for the `translate` attribute on a few elements,
  where glitch-soc had a different set of allowed elements and attributes.
  Extended glitch-soc's allowed attributes with `translate` as upstream did.
- `spec/validators/status_length_validator_spec.rb`:
  Upstream refactored to use RSpec's `instance_double` instead of `double`,
  but glitch-soc had changes to tests due to configurable max toot chars.
  Applied upstream's changes while keeping tests against configurable max
  toot chars.
2023-06-25 14:27:38 +02:00
..
admin Fix incorrect pagination headers in `/api/v2/admin/accounts` (#25477) 2023-06-19 08:53:05 +02:00
filters Fix Rails/ActionOrder cop (#24692) 2023-04-30 06:46:39 +02:00
filters_controller.rb Fix Rails/ActionOrder cop (#24692) 2023-04-30 06:46:39 +02:00
instances_controller.rb Change unauthenticated responses to be cached in REST API (#24348) 2023-04-25 15:41:34 +02:00
media_controller.rb Make it possible to upload audio and video to Heroku app (#24866) 2023-05-05 14:41:07 +02:00
search_controller.rb Merge branch 'main' into glitch-soc/merge-upstream 2022-10-28 19:23:58 +02:00
suggestions_controller.rb Add cold-start follow recommendations (#15945) 2021-04-12 12:37:14 +02:00