Claire 912582b198 Merge pull request from GHSA-9928-3cp5-93fm ... * Fix attachments getting processed despite failing content-type validation * Add a restrictive ImageMagick security policy tailored for Mastodon * Fix misdetection of MP3 files with large cover art * Reject unprocessable audio/video files instead of keeping them unchanged		2023-07-07 13:42:05 +10:00
..
environments	Revert "Rails 7 update" (#25667)	2023-07-02 11:14:22 +02:00
imagemagick	Merge pull request from GHSA-9928-3cp5-93fm	2023-07-07 13:42:05 +10:00
initializers	Merge pull request from GHSA-9928-3cp5-93fm	2023-07-07 13:42:05 +10:00
locales	th: merge glitch again (lol)	2023-07-05 01:14:10 -07:00
locales-glitch	Merge commit '9e245d147bcb2c72cc552ff8c276a1c34e2f686d' into glitch-soc/merge-upstream	2023-06-18 13:41:33 +02:00
routes	Merge branch 'main' into glitch-soc/merge-upstream	2023-07-02 11:49:08 +02:00
webpack	Switch to using a `common` runtime chunk rather than `locales`	2023-06-10 17:43:13 +02:00
application.rb	Merge pull request from GHSA-9928-3cp5-93fm	2023-07-07 13:42:05 +10:00
boot.rb	Use default `bootsnap/setup` in boot.rb (#25502)	2023-06-22 18:46:32 +02: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	Fix pgBouncer resetting application name on every transaction (#23958)	2023-03-05 01:52:42 +01:00
deploy.rb	Fix Performance/CollectionLiteralInLoop cop (#24819)	2023-05-04 05:33:55 +02:00
environment.rb	…
formatjs-formatter.js	Merge commit '44cd88adc4e2f4028dcc2b08b98368f0dc90cee4' into glitch-soc/merge-upstream	2023-06-10 12:38:33 +02:00
i18n-tasks.yml	Merge commit '39110d1d0af5e3d9cf452ae47496a52797249fd0' into glitch-soc/merge-upstream	2023-06-18 10:36:14 +02:00
navigation.rb	Merge commit '9e245d147bcb2c72cc552ff8c276a1c34e2f686d' into glitch-soc/merge-upstream	2023-06-18 13:41:33 +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	Support the PROXY protocol through the PROXY_PROTO_V1 env variable (#24064)	2023-03-14 14:47:57 +01:00
roles.yml	Add customizable user roles (#18641)	2022-07-05 02:41:40 +02:00
routes.rb	Change labels of live feeds tabs in web UI (#25683)	2023-07-07 13:42:04 +10:00
secrets.yml	…
settings.yml	Merge commit 'bec6a1cad4c509c53deb378c7ba984ba7e2de5a9' into glitch-soc/merge-upstream	2023-05-25 22:49:18 +02:00
sidekiq.yml	Bump sidekiq-scheduler from 4.0.3 to 5.0.0 (#23212)	2023-02-13 13:31:42 +01:00
storage.yml	Update Mastodon to Rails 6.1 (#15910)	2021-03-24 10:44:31 +01:00
webpacker.yml	Merge branch 'main' into glitch-soc/merge-upstream	2023-04-03 17:40:59 +02:00