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

2022-08-15 14:33:05 +02:00
parent 3f15326a05 113dd90aa3
commit e2a7a458d6
159 changed files with 1537 additions and 1316 deletions
--- a/2
+++ b/2
@@ -121,7 +121,7 @@ group :test do
  gem 'rails-controller-testing', '~> 1.0'
  gem 'rspec-sidekiq', '~> 3.1'
  gem 'simplecov', '~> 0.21', require: false
-  gem 'webmock', '~> 3.14'
+  gem 'webmock', '~> 3.17'
  gem 'rspec_junit_formatter', '~> 0.5'
 end