summaryrefslogtreecommitdiff
path: root/scripts/merge-simplecov
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-07-20 12:26:25 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-07-20 12:26:25 +0000
commita09983ae35713f5a2bbb100981116d31ce99826e (patch)
tree2ee2af7bd104d57086db360a7e6d8c9d5d43667a /scripts/merge-simplecov
parent18c5ab32b738c0b6ecb4d0df3994000482f34bd8 (diff)
downloadgitlab-ce-a09983ae35713f5a2bbb100981116d31ce99826e.tar.gz
Add latest changes from gitlab-org/gitlab@13-2-stable-ee
Diffstat (limited to 'scripts/merge-simplecov')
-rwxr-xr-xscripts/merge-simplecov1
1 files changed, 1 insertions, 0 deletions
diff --git a/scripts/merge-simplecov b/scripts/merge-simplecov
index 746be3317a7..c00dae81c4d 100755
--- a/scripts/merge-simplecov
+++ b/scripts/merge-simplecov
@@ -2,6 +2,7 @@
require_relative '../spec/simplecov_env'
SimpleCovEnv.configure_profile
+SimpleCovEnv.configure_formatter
module SimpleCov
module ResultMerger