Merge branch 'main' into glitch-soc/main

2022-12-09 16:48:55 +01:00
parent 859db01268 4555ecf995
commit e877bb47b8
102 changed files with 1909 additions and 3311 deletions
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -418,7 +418,7 @@ GEM
      net-protocol
    net-ssh (7.0.1)
    nio4r (2.5.8)
-    nokogiri (1.13.9)
+    nokogiri (1.13.10)
      mini_portile2 (~> 2.8.0)
      racc (~> 1.4)
    nsa (0.2.8)
@@ -489,7 +489,7 @@ GEM
    pundit (2.2.0)
      activesupport (>= 3.0.0)
    raabro (1.4.0)
-    racc (1.6.0)
+    racc (1.6.1)
    rack (2.2.4)
    rack-attack (6.6.1)
      rack (>= 1.0, < 3)