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

2022-03-12 11:51:25 +01:00
parent 2c8bb17453 d3aa9cf774
commit bb9a6fb5c2
308 changed files with 4127 additions and 2772 deletions
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -468,7 +468,7 @@ GEM
    raabro (1.4.0)
    racc (1.6.0)
    rack (2.2.3)
-    rack-attack (6.5.0)
+    rack-attack (6.6.0)
      rack (>= 1.0, < 3)
    rack-cors (1.1.1)
      rack (>= 2.0.0)
@@ -804,7 +804,7 @@ DEPENDENCIES
  puma (~> 5.6)
  pundit (~> 2.2)
  rack (~> 2.2.3)
-  rack-attack (~> 6.5)
+  rack-attack (~> 6.6)
  rack-cors (~> 1.1)
  rails (~> 6.1.4)
  rails-controller-testing (~> 1.0)