Claire a482932649 Merge commit '6f7615ba86' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/application_controller.rb`: Not a real conflict, upstream fixed a bug in a line adjacent to code modified by glitch-soc. Ported upstream's change.		2024-02-27 19:20:57 +01:00
..
environments	Merge commit '3205a654ca' into glitch-soc/merge-upstream	2024-01-26 20:47:20 +01:00
imagemagick	Fix AVIF attachments (#26264)	2023-08-01 19:34:11 +02:00
initializers	Merge commit 'c645490d55' into glitch-soc/merge-upstream	2024-02-24 14:46:14 +01:00
locales	New Crowdin Translations (automated) (#29423)	2024-02-27 14:53:53 +00:00
locales-glitch	New Crowdin Translations (automated) (#2564)	2024-01-26 19:45:04 +01:00
routes	Merge commit '7a1f087659' into glitch-soc/merge-upstream	2024-01-25 19:51:19 +01:00
templates	Move privacy policy into markdown file (#28699)	2024-01-19 11:22:23 +00:00
webpack	Merge commit '01b6c83c36' into glitch-soc/merge-upstream	2024-01-16 12:04:11 +01:00
application.rb	Enable Rails 7.1 Marshalling format (#28609)	2024-01-05 21:57:47 +00:00
boot.rb	Use abort instead of warn(); exit in boot.rb env check (#29209)	2024-02-16 14:29:24 +00:00
brakeman.yml	Configure brakeman to ignore url safe preview card urls (#25883)	2023-10-20 15:32:16 +02:00
database.yml	Using Sidekiq concurrency for default db pool value (#26488)	2023-11-08 13:15:43 +00:00
deploy.rb	Fix Lint/SymbolConversion cop (#28175)	2023-12-01 15:53:35 +00:00
environment.rb	Enable Rubocop Style/FrozenStringLiteralComment (#23793)	2023-07-12 09:47:08 +02:00
formatjs-formatter.js	Merge commit '44cd88adc4' into glitch-soc/merge-upstream	2023-06-10 12:38:33 +02:00
i18n-tasks.yml	Merge commit '0b4a3a0437' into glitch-soc/merge-upstream	2023-12-20 22:16:50 +01:00
navigation.rb	Merge commit '379115e601' into glitch-soc/merge-upstream	2023-10-24 19:31:14 +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	Enable Rubocop Style/FrozenStringLiteralComment (#23793)	2023-07-12 09:47:08 +02:00
roles.yml	Add customizable user roles (#18641)	2022-07-05 02:41:40 +02:00
routes.rb	Merge commit 'fa0ba67753' into glitch-soc/merge-upstream	2024-02-24 14:18:16 +01:00
secrets.yml
settings.yml	Merge commit '9d8dfeb5fb' into glitch-soc/merge-upstream	2024-02-24 15:35:56 +01:00
sidekiq.yml	Automatically switch from open to approved registrations in absence of moderators (#29318)	2024-02-22 20:45:40 +01:00
storage.yml	Update Mastodon to Rails 6.1 (#15910)	2021-03-24 10:44:31 +01:00
webpacker.yml	Merge commit '4ad1c5aa71' into glitch-soc/merge-upstream	2023-09-02 13:31:15 +02:00