From 84d002d64de02f8425a534b0dc35ce7cf5f073c5 Mon Sep 17 00:00:00 2001
From: Stan Hu <stanhu@gmail.com>
Date: Sun, 30 Dec 2018 00:16:02 -0800
Subject: [PATCH] Bump minitest to 5.11.3 to match Gitaly version

This prevents us from shipping duplicate versions of this gem.
---
 Gemfile      | 2 +-
 Gemfile.lock | 4 ++--
 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
-- 
2.30.9