diff options
author | Robert Speicher <rspeicher@gmail.com> | 2021-01-20 22:34:23 +0300 |
---|---|---|
committer | Robert Speicher <rspeicher@gmail.com> | 2021-01-20 22:34:23 +0300 |
commit | 6438df3a1e0fb944485cebf07976160184697d72 (patch) | |
tree | 00b09bfd170e77ae9391b1a2f5a93ef6839f2597 /app/serializers/merge_requests | |
parent | 42bcd54d971da7ef2854b896a7b34f4ef8601067 (diff) |
Add latest changes from gitlab-org/gitlab@13-8-stable-eev13.8.0-rc42
Diffstat (limited to 'app/serializers/merge_requests')
-rw-r--r-- | app/serializers/merge_requests/pipeline_entity.rb | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/app/serializers/merge_requests/pipeline_entity.rb b/app/serializers/merge_requests/pipeline_entity.rb index 97d7620154e..8b684d4641b 100644 --- a/app/serializers/merge_requests/pipeline_entity.rb +++ b/app/serializers/merge_requests/pipeline_entity.rb @@ -21,6 +21,16 @@ class MergeRequests::PipelineEntity < Grape::Entity pipeline.present.name end + expose :artifacts do |pipeline, options| + rel = pipeline.downloadable_artifacts + + if Feature.enabled?(:non_public_artifacts, type: :development) + rel = rel.select { |artifact| can?(request.current_user, :read_job_artifacts, artifact.job) } + end + + BuildArtifactEntity.represent(rel, options) + end + expose :detailed_status, as: :status, with: DetailedStatusEntity do |pipeline| pipeline.detailed_status(request.current_user) end |