Merge branch 'sh-bump-mini-test' into 'master'

Bump minitest to 5.11.3 to match Gitaly version

See merge request gitlab-org/gitlab-ce!24070
This commit is contained in:
Lin Jen-Shin 2019-01-03 11:07:11 +00:00
commit 494a99e15d
2 changed files with 3 additions and 3 deletions

View file

@ -337,7 +337,7 @@ group :development, :test do
gem 'rspec-parameterized', require: false
# Prevent occasions where minitest is not bundled in packaged versions of ruby (see #3826)
gem 'minitest', '~> 5.7.0'
gem 'minitest', '~> 5.11.0'
# Generate Fake data
gem 'ffaker', '~> 2.10'

View file

@ -463,7 +463,7 @@ GEM
mini_magick (4.8.0)
mini_mime (1.0.1)
mini_portile2 (2.3.0)
minitest (5.7.0)
minitest (5.11.3)
msgpack (1.2.4)
multi_json (1.13.1)
multi_xml (0.6.0)
@ -1054,7 +1054,7 @@ DEPENDENCIES
method_source (~> 0.8)
mimemagic (~> 0.3.2)
mini_magick
minitest (~> 5.7.0)
minitest (~> 5.11.0)
mysql2 (~> 0.4.10)
nakayoshi_fork (~> 0.0.4)
net-ldap