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

This commit is contained in:
Claire
2022-02-19 11:33:18 +01:00
215 changed files with 3330 additions and 1634 deletions

View File

@@ -442,7 +442,7 @@ GEM
public_suffix (4.0.6)
puma (5.6.2)
nio4r (~> 2.0)
pundit (2.1.1)
pundit (2.2.0)
activesupport (>= 3.0.0)
raabro (1.4.0)
racc (1.6.0)
@@ -761,7 +761,7 @@ DEPENDENCIES
pry-byebug (~> 3.9)
pry-rails (~> 0.3)
puma (~> 5.6)
pundit (~> 2.1)
pundit (~> 2.2)
rack (~> 2.2.3)
rack-attack (~> 6.5)
rack-cors (~> 1.1)