diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-04-26 15:09:44 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-04-26 15:09:44 +0300 |
| commit | e5e0589e097991ca671a348de81331240e85719d (patch) | |
| tree | 0767e6d3388f6ebf65f5d47a3ecb0d52430fa7da /scripts/merge-simplecov | |
| parent | 0ccabeb3f62c5fbc81f52cc16fa654404bb87874 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'scripts/merge-simplecov')
| -rwxr-xr-x | scripts/merge-simplecov | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/merge-simplecov b/scripts/merge-simplecov index 38dd2dfe2e9..b74a416a6e0 100755 --- a/scripts/merge-simplecov +++ b/scripts/merge-simplecov @@ -15,7 +15,7 @@ module SimpleCov def resultset_hashes resultset_files.map do |path| JSON.parse(File.read(path)) - rescue + rescue StandardError {} end end |