glitchier-soc/spec/views
Eugen Rochko dac14696a0 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
..
about Add server banner to web app, add GET /api/v2/instance to REST API (#19294) 2022-10-09 19:51:39 +02:00
statuses Fix error when rendering public pages with media attachments (#16763) 2021-10-13 15:27:19 +02:00