Merge branch 'main' into glitch-soc/merge-upstream

This commit is contained in:
Claire
2022-03-12 11:51:25 +01:00
308 changed files with 4127 additions and 2772 deletions

View File

@@ -68,7 +68,7 @@ gem 'parslet'
gem 'posix-spawn'
gem 'pundit', '~> 2.2'
gem 'premailer-rails'
gem 'rack-attack', '~> 6.5'
gem 'rack-attack', '~> 6.6'
gem 'rack-cors', '~> 1.1', require: 'rack/cors'
gem 'rails-i18n', '~> 6.0'
gem 'rails-settings-cached', '~> 0.6'