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
..
actions	Add server banner to web app, add `GET /api/v2/instance` to REST API (#19294)	2022-10-09 19:51:39 +02:00
components	Add server banner to web app, add `GET /api/v2/instance` to REST API (#19294)	2022-10-09 19:51:39 +02:00
containers	…
features	Add server banner to web app, add `GET /api/v2/instance` to REST API (#19294)	2022-10-09 19:51:39 +02:00
locales	Merge branch 'main' into glitch-soc/merge-upstream	2022-10-08 15:49:40 +02:00
middleware	…
reducers	Add server banner to web app, add `GET /api/v2/instance` to REST API (#19294)	2022-10-09 19:51:39 +02:00
selectors	…
service_worker	…
store	…
utils	…
api.js	…
base_polyfills.js	…
blurhash.js	…
common.js	…
compare_id.js	…
extra_polyfills.js	…
initial_state.js	Add server banner to web app, add `GET /api/v2/instance` to REST API (#19294)	2022-10-09 19:51:39 +02:00
is_mobile.js	…
load_keyboard_extensions.js	…
load_polyfills.js	…
main.js	Disable push notification when not logged in (#19272)	2022-10-03 18:15:47 +02:00
performance.js	…
permissions.js	…
ready.js	Disable push notification when not logged in (#19272)	2022-10-03 18:15:47 +02:00
scroll.js	…
settings.js	…
stream.js	…
test_setup.js	…
uuid.js	…