mastodon/config
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 Merge branch 'main' into glitch-soc/merge-upstream 2022-08-25 05:07:39 +02:00
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 Make “Flavour and skin” admin setting label translatable (#1791) 2022-05-31 16:52:52 +02:00
webpack Merge branch 'main' into glitch-soc/merge-upstream 2022-08-28 11:31:00 +02:00
application.rb Remove Rack::Deflater (#17937) 2022-08-13 15:40:00 +02:00
boot.rb Bump bootsnap from 1.6.0 to 1.8.1 (#16677) 2021-09-19 14:42:32 +09:00
brakeman.ignore Fix IDN domains not being rendered correctly in a few left-over places (#17848) 2022-03-22 10:07:11 +01:00
database.yml Format JSON and YAML using Prettier (#17823) 2022-03-21 04:46:11 +01:00
deploy.rb Bump capistrano from 3.17.0 to 3.17.1 (#18949) 2022-08-15 07:50:50 +09:00
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 Merge branch 'main' into glitch-soc/merge-upstream 2022-07-05 09:33:44 +02:00
pghero.yml Fix PgHero Content-Security-Policy when CDN_HOST is used (#13595) 2020-05-04 13:52:41 +02:00
puma.rb
roles.yml Add customizable user roles (#18641) 2022-07-05 02:41:40 +02:00
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 Update Mastodon to Rails 6.1 (#15910) 2021-03-24 10:44:31 +01:00
webpacker.yml