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

2022-02-19 11:33:18 +01:00
parent c8ef003c6b 2e89067d21
commit dc121b609f
215 changed files with 3330 additions and 1634 deletions
--- a/2
+++ b/2
@@ -65,7 +65,7 @@ gem 'oj', '~> 3.13'
 gem 'ox', '~> 2.14'
 gem 'parslet'
 gem 'posix-spawn'
-gem 'pundit', '~> 2.1'
+gem 'pundit', '~> 2.2'
 gem 'premailer-rails'
 gem 'rack-attack', '~> 6.5'
 gem 'rack-cors', '~> 1.1', require: 'rack/cors'