diff options
author | Thibaut Girka <thib@sitedethib.com> | 2018-10-23 17:15:57 +0200 |
---|---|---|
committer | Thibaut Girka <thib@sitedethib.com> | 2018-10-23 17:15:57 +0200 |
commit | 8f3096b846f6af87d74304c98fcc66932140f42d (patch) | |
tree | 034c4072c9447bb98cb130ed2c5d005f266ae63b /Gemfile | |
parent | 0c7f710be1208397f2d803270a503c1224f19831 (diff) | |
parent | 65867b6e6170ab6bc4db6d94b46cd3ddd6b82113 (diff) |
Merge branch 'master' into glitch-soc/merge-upstream
Diffstat (limited to 'Gemfile')
-rw-r--r-- | Gemfile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Gemfile b/Gemfile index 950e666de..ee9b746a6 100644 --- a/Gemfile +++ b/Gemfile @@ -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 |