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

2021-05-18 09:40:17 +02:00
parent 567745c1e6 08d6a7764f
commit f3d96d4ecb
6 changed files with 12 additions and 12 deletions
--- a/Gemfile.lock
+++ b/Gemfile.lock
@ -364,7 +364,7 @@ GEM
      net-ssh (>= 2.6.5, < 7.0.0)
    net-ssh (6.1.0)
    nio4r (2.5.7)
-    nokogiri (1.11.3)
+    nokogiri (1.11.4)
      mini_portile2 (~> 2.5.0)
      racc (~> 1.4)
    nokogumbo (2.0.4)
@ -428,7 +428,7 @@ GEM
    pry-rails (0.3.9)
      pry (>= 0.10.4)
    public_suffix (4.0.6)
-    puma (5.3.0)
+    puma (5.3.1)
      nio4r (~> 2.0)
    pundit (2.1.0)
      activesupport (>= 3.0.0)