diff options
| author | Lin Jen-Shin <godfat@godfat.org> | 2019-01-03 11:07:11 +0000 |
|---|---|---|
| committer | Lin Jen-Shin <godfat@godfat.org> | 2019-01-03 11:07:11 +0000 |
| commit | 494a99e15d0fe02bbe4aa4ba6fbda90dd817d485 (patch) | |
| tree | 4781524a18ea02bfb434509c12a0ed76c9bf94f8 | |
| parent | 4484a925ab04e5fc8245ca5bb68076101f862bf6 (diff) | |
| parent | 84d002d64de02f8425a534b0dc35ce7cf5f073c5 (diff) | |
| download | gitlab-ce-494a99e15d0fe02bbe4aa4ba6fbda90dd817d485.tar.gz | |
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
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 4 |
2 files changed, 3 insertions, 3 deletions
@@ -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' diff --git a/Gemfile.lock b/Gemfile.lock index 78cf4d19078..4dda0bcad18 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -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 |