You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

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.		2 years ago
..
environments	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
initializers	Revert "Change "Allow trends without prior review" setting to include statuses (#17977)"	2 years ago
locales	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
locales-glitch	Make “Flavour and skin” admin setting label translatable (#1791)	2 years ago
webpack	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
application.rb	Remove Rack::Deflater (#17937)	2 years ago
boot.rb	Bump bootsnap from 1.6.0 to 1.8.1 (#16677)	3 years ago
brakeman.ignore	Fix IDN domains not being rendered correctly in a few left-over places (#17848)	3 years ago
database.yml	Format JSON and YAML using Prettier (#17823)	3 years ago
deploy.rb	Bump capistrano from 3.17.0 to 3.17.1 (#18949)	2 years ago
environment.rb	Make PreviewCard records reuseable between statuses (#4642)	7 years ago
i18n-tasks.yml	Revert "Change "Allow trends without prior review" setting to include statuses (#17977)"	2 years ago
navigation.rb	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
pghero.yml	Fix PgHero Content-Security-Policy when CDN_HOST is used (#13595)	5 years ago
puma.rb	Add PERSISTENT_TIMEOUT option (#11756)	5 years ago
roles.yml	Add customizable user roles (#18641)	2 years ago
routes.rb	Add server banner to web app, add `GET /api/v2/instance` to REST API (#19294)	2 years ago
secrets.yml	Upgrade to Rails 5.0.0.1	8 years ago
settings.yml	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
sidekiq.yml	Add retention policy for cached content and media (#19232)	2 years ago
storage.yml	Update Mastodon to Rails 6.1 (#15910)	4 years ago
webpacker.yml	Do not try to parse gif files as CSS or JS	6 years ago