catstodon/app/controllers/api/v2
Claire 0ad919b192 Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `app/javascript/mastodon/features/compose/components/poll_form.js`:
  glitch-soc change because of having changed the default number of
  available poll options.
  Applied upstream's changes while keeping glitch-soc's default number of
  poll options.
- `public/oops.png`:
  We had a minor graphics change, probably not worth diverging from upstream.
  Took upstream version.
2022-11-06 09:50:41 +01:00
..
admin Add customizable user roles (#18641) 2022-07-05 02:41:40 +02:00
filters_controller.rb Revamp post filtering system (#18058) 2022-06-28 09:42:13 +02:00
instances_controller.rb Add server banner to web app, add GET /api/v2/instance to REST API (#19294) 2022-10-09 19:51:39 +02:00
media_controller.rb Change post-processing to be deferred only for large media types (#19617) 2022-11-01 15:27:58 +01: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