diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-26 09:08:40 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-26 09:08:40 +0300 |
| commit | 116d4e56e83a1f408afe710ce070e699ba206475 (patch) | |
| tree | cc62d3820d9bfa199061edfdef3a2f4bda140507 /app/models/ci | |
| parent | dddde902acfa6acfb11583c61faa67cc7c8d11b6 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models/ci')
| -rw-r--r-- | app/models/ci/build.rb | 2 | ||||
| -rw-r--r-- | app/models/ci/pipeline.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/models/ci/build.rb b/app/models/ci/build.rb index f9d17bfc8b7..fb9e341dff7 100644 --- a/app/models/ci/build.rb +++ b/app/models/ci/build.rb @@ -873,7 +873,7 @@ module Ci def collect_test_reports!(test_reports) test_reports.get_suite(group_name).tap do |test_suite| each_report(Ci::JobArtifact::TEST_REPORT_FILE_TYPES) do |file_type, blob| - Gitlab::Ci::Parsers.fabricate!(file_type).parse!(blob, test_suite) + Gitlab::Ci::Parsers.fabricate!(file_type).parse!(blob, test_suite, job: self) end end end diff --git a/app/models/ci/pipeline.rb b/app/models/ci/pipeline.rb index ef22b429df9..e9cd0d91bc0 100644 --- a/app/models/ci/pipeline.rb +++ b/app/models/ci/pipeline.rb @@ -813,7 +813,7 @@ module Ci def test_reports Gitlab::Ci::Reports::TestReports.new.tap do |test_reports| - builds.latest.with_reports(Ci::JobArtifact.test_reports).each do |build| + builds.latest.with_reports(Ci::JobArtifact.test_reports).preload(:project).find_each do |build| build.collect_test_reports!(test_reports) end end |