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

Conflicts: - `package.json`: Not really a conflict, upstream updated a dependency textually adjacent to a glitch-soc-only one. Updated the dependency as upstream did.
2022-05-11 09:37:48 +02:00
parent e8b8ac8908 95555f15b5
commit 5fd8780b14
41 changed files with 916 additions and 754 deletions
--- a/2
+++ b/2
@ -114,7 +114,7 @@ group :production, :test do
 end

 group :test do
-  gem 'capybara', '~> 3.36'
+  gem 'capybara', '~> 3.37'
  gem 'climate_control', '~> 0.2'
  gem 'faker', '~> 2.20'
  gem 'microformats', '~> 4.2'