diff options
| author | Grzegorz Bizon <grzegorz@gitlab.com> | 2017-12-05 14:30:59 +0000 |
|---|---|---|
| committer | Grzegorz Bizon <grzegorz@gitlab.com> | 2017-12-05 14:30:59 +0000 |
| commit | 003a816afa885d56aa1eb4aadbad2b13b1baa25b (patch) | |
| tree | ba40a1da8ce0c3844ba1ebf0abbffc4ab66d599d /lib/api/entities.rb | |
| parent | 29be9c1acc9523a513ce32d8a56298db1a038873 (diff) | |
| parent | 9711b34491d5cfd6eb2bf379f43dbbcd629a572c (diff) | |
| download | gitlab-ce-003a816afa885d56aa1eb4aadbad2b13b1baa25b.tar.gz | |
Merge branch 'zj-multiple-artifacts' into 'master'
Multiple artifacts
See merge request gitlab-org/gitlab-ce!14367
Diffstat (limited to 'lib/api/entities.rb')
| -rw-r--r-- | lib/api/entities.rb | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/lib/api/entities.rb b/lib/api/entities.rb index 7cec8da013d..62ee20bf7de 100644 --- a/lib/api/entities.rb +++ b/lib/api/entities.rb @@ -1050,13 +1050,9 @@ module API expose :type, :url, :username, :password end - class ArtifactFile < Grape::Entity - expose :filename, :size - end - class Dependency < Grape::Entity expose :id, :name, :token - expose :artifacts_file, using: ArtifactFile, if: ->(job, _) { job.artifacts? } + expose :artifacts_file, using: JobArtifactFile, if: ->(job, _) { job.artifacts? } end class Response < Grape::Entity |