Merge branch 'update-simplecov-to-0.17.1' into 'master'

Update simplecov to 0.17.1

See merge request gitlab-org/gitaly!1723

4 files changed, 18 insertions, 19 deletions

diff --git a/ruby/Gemfile b/ruby/Gemfile
index 841f6bfde..81a8d9f69 100644
--- a/ruby/Gemfile
+++ b/ruby/Gemfile
@@ -34,7 +34,7 @@ group :development, :test do
 
   # gitlab-shell spec gems
   gem 'listen', '~> 0.5.0'
-  gem 'simplecov', '~> 0.9.0', require: false
+  gem 'simplecov', '~> 0.17.1', require: false
   gem 'vcr', '~> 4.0.0'
   gem 'webmock', '~> 3.4.0'
 end
diff --git a/ruby/Gemfile.lock b/ruby/Gemfile.lock
index 9d28a0730..4eb24b27f 100644
--- a/ruby/Gemfile.lock
+++ b/ruby/Gemfile.lock
@@ -38,7 +38,7 @@ GEM
       safe_yaml (~> 1.0.0)
     crass (1.0.4)
     diff-lcs (1.3)
-    docile (1.1.5)
+    docile (1.3.2)
     equalizer (0.0.11)
     erubi (1.8.0)
     escape_utils (1.2.1)
@@ -112,7 +112,6 @@ GEM
     mini_portile2 (2.4.0)
     minitest (5.11.3)
     msgpack (1.3.1)
-    multi_json (1.13.1)
     multipart-post (2.0.0)
     nokogiri (1.10.5)
       mini_portile2 (~> 2.4.0)
@@ -184,11 +183,11 @@ GEM
       nokogumbo (~> 1.4)
     sentry-raven (2.9.0)
       faraday (>= 0.7.6, < 1.0)
-    simplecov (0.9.2)
-      docile (~> 1.1.0)
-      multi_json (~> 1.0)
-      simplecov-html (~> 0.9.0)
-    simplecov-html (0.9.0)
+    simplecov (0.17.1)
+      docile (~> 1.1)
+      json (>= 1.8, < 3)
+      simplecov-html (~> 0.10.0)
+    simplecov-html (0.10.2)
     stringex (2.8.5)
     thread_safe (0.3.6)
     thrift (0.11.0.0)
@@ -235,7 +234,7 @@ DEPENDENCIES
   rubocop (~> 0.69)
   rugged (~> 0.28)
   sentry-raven (~> 2.9.0)
-  simplecov (~> 0.9.0)
+  simplecov (~> 0.17.1)
   timecop
   vcr (~> 4.0.0)
   webmock (~> 3.4.0)
diff --git a/ruby/gitlab-shell/Gemfile b/ruby/gitlab-shell/Gemfile
index cabe4079d..4018c208f 100644
--- a/ruby/gitlab-shell/Gemfile
+++ b/ruby/gitlab-shell/Gemfile
@@ -6,7 +6,7 @@ group :development, :test do
   gem 'rspec', '~> 3.8.0'
   gem 'rspec-parameterized', '~> 0.4.0'
   gem 'rubocop', '0.49.1', require: false
-  gem 'simplecov', '~> 0.9.0', require: false
+  gem 'simplecov', '~> 0.17.1', require: false
   gem 'vcr', '~> 4.0.0'
   gem 'webmock', '~> 3.4.0'
 end
diff --git a/ruby/gitlab-shell/Gemfile.lock b/ruby/gitlab-shell/Gemfile.lock
index 3e79a1c24..b08d4c9f6 100644
--- a/ruby/gitlab-shell/Gemfile.lock
+++ b/ruby/gitlab-shell/Gemfile.lock
@@ -18,15 +18,15 @@ GEM
       safe_yaml (~> 1.0.0)
     debug_inspector (0.0.3)
     diff-lcs (1.3)
-    docile (1.1.5)
+    docile (1.3.2)
     equalizer (0.0.11)
     hashdiff (0.3.7)
     ice_nine (0.11.2)
+    json (2.3.0)
     listen (0.5.3)
     memoizable (0.4.2)
       thread_safe (~> 0.3, >= 0.3.1)
     method_source (0.9.2)
-    multi_json (1.13.1)
     parallel (1.12.1)
     parser (2.5.1.2)
       ast (~> 2.4.0)
@@ -71,11 +71,11 @@ GEM
       unicode-display_width (~> 1.0, >= 1.0.1)
     ruby-progressbar (1.9.0)
     safe_yaml (1.0.4)
-    simplecov (0.9.2)
-      docile (~> 1.1.0)
-      multi_json (~> 1.0)
-      simplecov-html (~> 0.9.0)
-    simplecov-html (0.9.0)
+    simplecov (0.17.1)
+      docile (~> 1.1)
+      json (>= 1.8, < 3)
+      simplecov-html (~> 0.10.0)
+    simplecov-html (0.10.2)
     thread_safe (0.3.6)
     unicode-display_width (1.4.0)
     unparser (0.2.8)
@@ -101,9 +101,9 @@ DEPENDENCIES
   rspec (~> 3.8.0)
   rspec-parameterized (~> 0.4.0)
   rubocop (= 0.49.1)
-  simplecov (~> 0.9.0)
+  simplecov (~> 0.17.1)
   vcr (~> 4.0.0)
   webmock (~> 3.4.0)
 
 BUNDLED WITH
-   1.16.3
+   1.17.3