diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-06-23 18:08:41 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-06-23 18:08:41 +0300 |
| commit | 5eeb39104356356bec81abe19479bca591e6f299 (patch) | |
| tree | 7534ccf94fb8100ce39b78278d275b2061773f95 /scripts | |
| parent | b7e512c8970dcce6feabc096885c7a1ea91e4694 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/frontend/merge_coverage_frontend.js | 2 | ||||
| -rwxr-xr-x | scripts/merge-simplecov | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/scripts/frontend/merge_coverage_frontend.js b/scripts/frontend/merge_coverage_frontend.js index 507695b45e5..99034176b29 100644 --- a/scripts/frontend/merge_coverage_frontend.js +++ b/scripts/frontend/merge_coverage_frontend.js @@ -26,6 +26,6 @@ reportFiles const context = createContext({ coverageMap: coverageMap, dir: 'coverage-frontend' }); -['json', 'lcov', 'text-summary', 'clover'].forEach(reporter => { +['json', 'lcov', 'text-summary', 'clover', 'cobertura'].forEach(reporter => { create(reporter, {}).execute(context); }); 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 |