diff options
author | Kamil Trzciński <ayufan@ayufan.eu> | 2019-04-16 12:54:47 +0000 |
---|---|---|
committer | Kamil Trzciński <ayufan@ayufan.eu> | 2019-04-16 12:54:47 +0000 |
commit | c16619c527afdd00aa4dbbbf7544afb2f38477a8 (patch) | |
tree | 2d541ceff47cbd16a3a6ea72e0f5e65b0c7b633b /app/models/ci/build.rb | |
parent | 29a53c4c31b8901f87818c86a9e8339334743616 (diff) | |
parent | 0cfa25ff21322d45aaef91fc7a3dd7c570632a05 (diff) | |
download | gitlab-ce-c16619c527afdd00aa4dbbbf7544afb2f38477a8.tar.gz |
Merge branch 'mc/feature/custom-metrics-ce' into 'master'
Backport metrics report type
See merge request gitlab-org/gitlab-ce!26798
Diffstat (limited to 'app/models/ci/build.rb')
-rw-r--r-- | app/models/ci/build.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/models/ci/build.rb b/app/models/ci/build.rb index b8a76e662b0..5cf9bb4979a 100644 --- a/app/models/ci/build.rb +++ b/app/models/ci/build.rb @@ -104,8 +104,8 @@ module Ci where('NOT EXISTS (?)', Ci::JobArtifact.select(1).where('ci_builds.id = ci_job_artifacts.job_id').trace) end - scope :with_test_reports, ->() do - with_existing_job_artifacts(Ci::JobArtifact.test_reports) + scope :with_reports, ->(reports_scope) do + with_existing_job_artifacts(reports_scope) .eager_load_job_artifacts end |