1
0
puyopuyotetr.is/app/controllers/api/v2
Eugen Rochko bf3cb42da7 Add server banner to web app, add GET /api/v2/instance to REST API (#19294)
Cherry-picked d2528b26b6

Conflicts:
- `app/serializers/initial_state_serializer.rb`:
  Upstream changed stuff, we had extra attributes.
  Applied upstream changes while keeping our extra attributes.
- `app/serializers/rest/instance_serializer.rb`:
  Upstream actually moved that to `app/serializers/rest/v1/instance_serializer.rb`,
  so updated that file by keeping our extra attributes, and took upstream's
  version of `app/serializers/rest/instance_serializer.rb`.
- `spec/views/about/show.html.haml_spec.rb`:
  Took upstream's version.
2022-10-09 19:51:39 +02: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 local media attachments to perform heavy processing asynchronously (#13210) 2020-03-08 23:56:18 +01:00
search_controller.rb Merge branch 'main' into glitch-soc/merge-upstream 2022-04-08 23:00:03 +02:00
suggestions_controller.rb Add cold-start follow recommendations (#15945) 2021-04-12 12:37:14 +02:00