mastodon/config
Claire b8209c3b96 Merge commit '85662a5a57531af5402a6777d0b1089e78c56815' 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
imagemagick
initializers
locales New Crowdin Translations (automated) (#28096) 2023-11-28 08:59:48 +00:00
locales-glitch
routes
webpack
application.rb Move lib/devise/* to lib/devise/strategies/* (#27638) 2023-11-29 10:10:21 +00:00
boot.rb
brakeman.yml
database.yml
deploy.rb
environment.rb Enable Rubocop Style/FrozenStringLiteralComment (#23793) 2023-07-12 09:47:08 +02:00
formatjs-formatter.js
i18n-tasks.yml
navigation.rb Merge commit '379115e601361c2b5da775fbf28b7dff9dc02e71' into glitch-soc/merge-upstream 2023-10-24 19:31:14 +02:00
pghero.yml
puma.rb Enable Rubocop Style/FrozenStringLiteralComment (#23793) 2023-07-12 09:47:08 +02:00
roles.yml
routes.rb
secrets.yml
settings.yml
sidekiq.yml
storage.yml Update Mastodon to Rails 6.1 (#15910) 2021-03-24 10:44:31 +01:00
webpacker.yml