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	Fix AVIF attachments (#26264)	2023-08-01 19:34:11 +02:00
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	Enable Rubocop Style/FrozenStringLiteralComment (#23793)	2023-07-12 09:47:08 +02: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 Performance/CollectionLiteralInLoop cop (#24819)	2023-05-04 05:33:55 +02: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 '2e6bf60f15' into glitch-soc/merge-upstream	2023-12-10 18:05:02 +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 'bd575a1dd6' into glitch-soc/merge-upstream	2023-12-19 20:17:23 +01:00
secrets.yml
settings.yml	Merge commit 'bec6a1cad4' into glitch-soc/merge-upstream	2023-05-25 22:49:18 +02:00
sidekiq.yml	Add SELF_DESTRUCT env variable to process self-destructions in the background (#26439)	2023-10-23 15:46:21 +00: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