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

2018-10-23 17:15:57 +02:00
parent 0c7f710be1 65867b6e61
commit 8f3096b846
12 changed files with 158 additions and 23 deletions
--- a/2
+++ b/2
@ -115,7 +115,7 @@ group :test do
  gem 'rspec-sidekiq', '~> 3.0'
  gem 'simplecov', '~> 0.16', require: false
  gem 'webmock', '~> 3.4'
-  gem 'parallel_tests', '~> 2.23'
+  gem 'parallel_tests', '~> 2.24'
 end

 group :development do