This repository has been archived on 2024-07-22. You can view files and clone it, but cannot push or open issues or pull requests.

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
..
environments	…
initializers	Revert "Change "Allow trends without prior review" setting to include statuses (#17977)"	2022-10-02 18:46:28 +02:00
locales	Merge branch 'main' into glitch-soc/merge-upstream	2022-10-08 15:49:40 +02:00
locales-glitch	…
webpack	…
application.rb	…
boot.rb	…
brakeman.ignore	…
database.yml	…
deploy.rb	…
environment.rb	…
i18n-tasks.yml	Revert "Change "Allow trends without prior review" setting to include statuses (#17977)"	2022-10-02 18:46:28 +02:00
navigation.rb	…
pghero.yml	…
puma.rb	…
roles.yml	…
routes.rb	Add server banner to web app, add `GET /api/v2/instance` to REST API (#19294)	2022-10-09 19:51:39 +02:00
secrets.yml	…
settings.yml	Merge branch 'main' into glitch-soc/merge-upstream	2022-10-02 18:46:22 +02:00
sidekiq.yml	Add retention policy for cached content and media (#19232)	2022-09-27 03:08:19 +02:00
storage.yml	…
webpacker.yml	…