]> cat aescling's git repositories - mastodon.git/commit
Add server banner to web app, add `GET /api/v2/instance` to REST API (#19294)
authorEugen Rochko <eugen@zeonfederated.com>
Wed, 5 Oct 2022 01:47:56 +0000 (03:47 +0200)
committeraescling <aescling+gitlab@cat.family>
Thu, 17 Nov 2022 05:28:25 +0000 (00:28 -0500)
commit656b4fbe9460733ba98ba21106fca23ac9897161
treece530c6f31d7c213bceb846d28791f13217d4eb6
parentb700ea0dd5d38c327a3d9f1cbf13a52719f32d92
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.
30 files changed:
app/controllers/about_controller.rb
app/controllers/api/v1/instances_controller.rb
app/controllers/api/v2/instances_controller.rb [new file with mode: 0644]
app/javascript/mastodon/actions/rules.js [deleted file]
app/javascript/mastodon/actions/server.js [new file with mode: 0644]
app/javascript/mastodon/components/account.js
app/javascript/mastodon/components/display_name.js
app/javascript/mastodon/components/server_banner.js [new file with mode: 0644]
app/javascript/mastodon/features/report/rules.js
app/javascript/mastodon/features/ui/components/compose_panel.js
app/javascript/mastodon/features/ui/components/report_modal.js
app/javascript/mastodon/features/ui/index.js
app/javascript/mastodon/initial_state.js
app/javascript/mastodon/reducers/index.js
app/javascript/mastodon/reducers/rules.js [deleted file]
app/javascript/mastodon/reducers/server.js [new file with mode: 0644]
app/javascript/styles/mastodon/components.scss
app/presenters/instance_presenter.rb
app/serializers/initial_state_serializer.rb
app/serializers/manifest_serializer.rb
app/serializers/rest/instance_serializer.rb
app/serializers/rest/v1/instance_serializer.rb [new file with mode: 0644]
app/views/about/more.html.haml
app/views/about/show.html.haml
app/views/application/_sidebar.html.haml
app/views/privacy/show.html.haml
app/views/shared/_og.html.haml
config/routes.rb
spec/presenters/instance_presenter_spec.rb
spec/views/about/show.html.haml_spec.rb