diff options
| author | Matija Čupić <matteeyah@gmail.com> | 2019-05-01 19:16:26 -0400 |
|---|---|---|
| committer | Matija Čupić <matteeyah@gmail.com> | 2019-05-28 17:06:29 +0200 |
| commit | 9e6f37744a7f30a181879a1e2799e129c5e795c9 (patch) | |
| tree | 46de47d5cc8f85ecd86f85b66e6cbd697a6428c0 /app | |
| parent | 31bd09a3924d1b76cac38996267ffe6ec08cad46 (diff) | |
| download | gitlab-ce-9e6f37744a7f30a181879a1e2799e129c5e795c9.tar.gz | |
Move JobArtifactEntity to JobArtifactReportEntity
Diffstat (limited to 'app')
| -rw-r--r-- | app/serializers/build_details_entity.rb | 2 | ||||
| -rw-r--r-- | app/serializers/job_artifact_report_entity.rb (renamed from app/serializers/job_artifact_entity.rb) | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/serializers/build_details_entity.rb b/app/serializers/build_details_entity.rb index ee5adc69660..601b2c47678 100644 --- a/app/serializers/build_details_entity.rb +++ b/app/serializers/build_details_entity.rb @@ -42,7 +42,7 @@ class BuildDetailsEntity < JobEntity end end - expose :reports, if: -> (*) { can?(current_user, :read_build, build) }, using: JobArtifactEntity do |build| + expose :reports, if: -> (*) { can?(current_user, :read_build, build) }, using: JobArtifactReportEntity do |build| build.job_artifacts.merge(Ci::JobArtifact.with_all_reports) end diff --git a/app/serializers/job_artifact_entity.rb b/app/serializers/job_artifact_report_entity.rb index 76ded287c75..857cbfe8ee8 100644 --- a/app/serializers/job_artifact_entity.rb +++ b/app/serializers/job_artifact_report_entity.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -class JobArtifactEntity < Grape::Entity +class JobArtifactReportEntity < Grape::Entity include RequestAwareEntity expose :file_type |