Claire b8209c3b96 Merge commit '85662a5a57' into glitch-soc/merge-upstream ... Conflicts: - `config/initializers/content_security_policy.rb`: Upstream reworked the CSP, we kept our version for now. - `spec/requests/content_security_policy_spec.rb`: Upstream reworked the CSP, we kept our version for now.		2023-12-20 20:10:45 +01:00
..
environments	Merge commit 'b87bfb8c96' into glitch-soc/merge-upstream	2023-12-18 18:34:25 +01:00
imagemagick
initializers	Merge commit '85662a5a57' into glitch-soc/merge-upstream	2023-12-20 20:10:45 +01:00
locales	New Crowdin Translations (automated) (#28096)	2023-11-28 08:59:48 +00:00
locales-glitch	Fix i18n unused check being tripped by no in YAML files (#2496)	2023-12-03 11:21:34 +01:00
routes	Merge commit '7840c6b75b' into glitch-soc/merge-upstream	2023-12-18 18:40:58 +01:00
webpack	Merge commit 'b2c5b20ef2' into glitch-soc/merge-upstream	2023-12-18 20:47:27 +01:00
application.rb	Move lib/devise/* to lib/devise/strategies/* (#27638)	2023-11-29 10:10:21 +00:00
boot.rb
brakeman.yml
database.yml	Using Sidekiq concurrency for default db pool value (#26488)	2023-11-08 13:15:43 +00:00
deploy.rb
environment.rb
formatjs-formatter.js
i18n-tasks.yml	Merge commit '2e6bf60f15' into glitch-soc/merge-upstream	2023-12-10 18:05:02 +01:00
navigation.rb
pghero.yml
puma.rb
roles.yml
routes.rb	Merge commit 'bd575a1dd6' into glitch-soc/merge-upstream	2023-12-19 20:17:23 +01:00
secrets.yml
settings.yml
sidekiq.yml
storage.yml
webpacker.yml