summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2018-12-30 00:16:02 -0800
committerStan Hu <stanhu@gmail.com>2018-12-30 00:16:02 -0800
commit84d002d64de02f8425a534b0dc35ce7cf5f073c5 (patch)
tree085bb5a3c595e03ffdd59e8f1cd873ad18ba381b
parente962baf4417e59cbb2ef8621ef0662f93f180f92 (diff)
downloadgitlab-ce-sh-bump-mini-test.tar.gz
Bump minitest to 5.11.3 to match Gitaly versionsh-bump-mini-test
This prevents us from shipping duplicate versions of this gem.
-rw-r--r--Gemfile2
-rw-r--r--Gemfile.lock4
2 files changed, 3 insertions, 3 deletions
diff --git a/Gemfile b/Gemfile
index c316f3b0e5f..90db17d9bfd 100644
--- a/Gemfile
+++ b/Gemfile
@@ -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 942dbac27a6..d6e6d22c28e 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