diff options
| author | Matija Čupić <matteeyah@gmail.com> | 2019-05-21 00:56:19 +0200 |
|---|---|---|
| committer | Matija Čupić <matteeyah@gmail.com> | 2019-05-28 17:06:29 +0200 |
| commit | c86fa0e45e4a053090b5c17b9678120e39f696a6 (patch) | |
| tree | 177623aae61915a5d23701ab8428c264261b0724 /app/serializers | |
| parent | 9e6f37744a7f30a181879a1e2799e129c5e795c9 (diff) | |
| download | gitlab-ce-c86fa0e45e4a053090b5c17b9678120e39f696a6.tar.gz | |
Rename with_all_reports to with_reports
Diffstat (limited to 'app/serializers')
| -rw-r--r-- | app/serializers/build_details_entity.rb | 2 | ||||
| -rw-r--r-- | app/serializers/job_artifact_report_entity.rb | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/app/serializers/build_details_entity.rb b/app/serializers/build_details_entity.rb index 601b2c47678..6be0a8d1499 100644 --- a/app/serializers/build_details_entity.rb +++ b/app/serializers/build_details_entity.rb @@ -43,7 +43,7 @@ class BuildDetailsEntity < JobEntity end expose :reports, if: -> (*) { can?(current_user, :read_build, build) }, using: JobArtifactReportEntity do |build| - build.job_artifacts.merge(Ci::JobArtifact.with_all_reports) + build.job_artifacts.with_reports end expose :erased_by, if: -> (*) { build.erased? }, using: UserEntity diff --git a/app/serializers/job_artifact_report_entity.rb b/app/serializers/job_artifact_report_entity.rb index 857cbfe8ee8..4280351a6b0 100644 --- a/app/serializers/job_artifact_report_entity.rb +++ b/app/serializers/job_artifact_report_entity.rb @@ -8,8 +8,6 @@ class JobArtifactReportEntity < Grape::Entity expose :size expose :download_path do |artifact| - download_project_job_artifacts_path(job.project, job, file_type: artifact.file_format) + download_project_job_artifacts_path(artifact.job.project, artifact.job, file_type: artifact.file_format) end - - alias_method :job, :object end |