summaryrefslogtreecommitdiff
path: root/scripts/merge-simplecov
diff options
context:
space:
mode:
authorKamil Trzcinski <ayufan@ayufan.eu>2016-06-30 19:04:00 +0200
committerGrzegorz Bizon <grzesiek.bizon@gmail.com>2016-07-21 12:44:24 +0200
commit070a96f54faac289d9254f0e8735f3926418335c (patch)
tree4ee7b4b0d3192ee63081c7b54bed19748683d647 /scripts/merge-simplecov
parent8cc7a2dd6f201019d6848aade74d938db356cc39 (diff)
downloadgitlab-ce-070a96f54faac289d9254f0e8735f3926418335c.tar.gz
Update configuration of SimpleCov
Diffstat (limited to 'scripts/merge-simplecov')
-rwxr-xr-xscripts/merge-simplecov4
1 files changed, 1 insertions, 3 deletions
diff --git a/scripts/merge-simplecov b/scripts/merge-simplecov
index b59ff0ae9a0..0d764d2b406 100755
--- a/scripts/merge-simplecov
+++ b/scripts/merge-simplecov
@@ -58,8 +58,6 @@ def merged_result
result
end
-SimpleCov.configure do
- merge_timeout 7200
-end
+require_relative '../spec/simplecov_env'
merged_result.format!