Merge branch 'expose-all-artifacts-sizes-in-jobs-api' into 'master'

Expose all artifacts sizes in jobs api

See merge request gitlab-org/gitlab-ce!20821

1 files changed, 6 insertions, 0 deletions

diff --git a/lib/api/entities.rb b/lib/api/entities.rb
index 453ebb9c669..458ee320099 100644
--- a/lib/api/entities.rb
+++ b/lib/api/entities.rb
@@ -1080,6 +1080,10 @@ module API
       expose :filename, :size
     end
 
+    class JobArtifact < Grape::Entity
+      expose :file_type, :size, :filename, :file_format
+    end
+
     class JobBasic < Grape::Entity
       expose :id, :status, :stage, :name, :ref, :tag, :coverage
       expose :created_at, :started_at, :finished_at
@@ -1094,7 +1098,9 @@ module API
     end
 
     class Job < JobBasic
+      # artifacts_file is included in job_artifacts, but kept for backward compatibility (remove in api/v5)
       expose :artifacts_file, using: JobArtifactFile, if: -> (job, opts) { job.artifacts? }
+      expose :job_artifacts, as: :artifacts, using: JobArtifact
       expose :runner, with: Runner
       expose :artifacts_expire_at
     end