diff options
| author | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2016-08-22 12:56:25 +0200 |
|---|---|---|
| committer | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2016-08-22 13:44:14 +0200 |
| commit | bac55c346aea519eab30bf00ffa24553b7349891 (patch) | |
| tree | cdc5ad37d34765eadb5b4983585b5b8d518082aa | |
| parent | b8728c0bb0e474edcdceaec9c7b6960bb6d879ac (diff) | |
| download | gitlab-ce-fix/coverage-report-merge-time.tar.gz | |
Bump SimpleCov merge timeout to 365 daysfix/coverage-report-merge-time
| -rw-r--r-- | spec/simplecov_env.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/spec/simplecov_env.rb b/spec/simplecov_env.rb index 6f8f7109e14..b507d38f472 100644 --- a/spec/simplecov_env.rb +++ b/spec/simplecov_env.rb @@ -1,4 +1,5 @@ require 'simplecov' +require 'active_support/core_ext/numeric/time' module SimpleCovEnv extend self @@ -48,7 +49,7 @@ module SimpleCovEnv add_group 'Uploaders', 'app/uploaders' add_group 'Validators', 'app/validators' - merge_timeout 7200 + merge_timeout 365.days end end end |