diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2022-10-05 03:47:56 +0200 |
|---|---|---|
| committer | Claire <claire.github-309c@sitedethib.com> | 2022-10-09 19:51:39 +0200 |
| commit | bf3cb42da78a3f31a9e07167a764aa942ec73731 (patch) | |
| tree | 5035a63d70172b51a8f70a7debb0f42107e63da4 /spec/fixtures | |
| parent | c9fadb3caede626a371cc481cbe1f2dba0bec0c4 (diff) | |
Add server banner to web app, add `GET /api/v2/instance` to REST API (#19294)
Cherry-picked d2528b26b6da34f34b5d7a392e263428d3c09d69 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.
Diffstat (limited to 'spec/fixtures')
0 files changed, 0 insertions, 0 deletions