From 26879909dd0571b392f105373a700a314201cd53 Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Tue, 22 Sep 2020 12:09:39 +0000
Subject: Add latest changes from gitlab-org/gitlab@master

---
 spec/simplecov_env.rb | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'spec/simplecov_env.rb')

diff --git a/spec/simplecov_env.rb b/spec/simplecov_env.rb
index 17b76205d9e..617a45ae449 100644
--- a/spec/simplecov_env.rb
+++ b/spec/simplecov_env.rb
@@ -2,7 +2,6 @@
 
 require 'simplecov'
 require 'simplecov-cobertura'
-require 'active_support/core_ext/numeric/time'
 require_relative '../lib/gitlab/utils'
 
 module SimpleCovEnv
@@ -75,7 +74,7 @@ module SimpleCovEnv
       add_group 'Libraries',    %w[/lib /ee/lib]
       add_group 'Tooling',      %w[/haml_lint /rubocop /tooling]
 
-      merge_timeout 365.days
+      merge_timeout 365 * 24 * 3600
     end
   end
 end
-- 
cgit v1.2.3