diff options
| author | Grzegorz Bizon <grzegorz@gitlab.com> | 2018-05-29 11:13:37 +0300 |
|---|---|---|
| committer | Grzegorz Bizon <grzegorz@gitlab.com> | 2018-05-29 11:13:37 +0300 |
| commit | 6b7a70d2018eae437c86fea6795ed97ba1e599bc (patch) | |
| tree | f891de64c233286aebb11838ca7c587c9f6904b2 /lib | |
| parent | 43ec52ab36069faa060f227fb73d6efeff5b96a5 (diff) | |
| parent | 4131a49bb72ab62c9384050d90ec268b4f3d76aa (diff) | |
Merge branch 'add-artifacts_expire_at-to-api' into 'master'
Expose artifacts_expire_at field for job entity in api
See merge request gitlab-org/gitlab-ce!18872
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/api/entities.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/api/entities.rb b/lib/api/entities.rb index 174c5af91d5..3e615f7ac05 100644 --- a/lib/api/entities.rb +++ b/lib/api/entities.rb @@ -1020,6 +1020,7 @@ module API class Job < JobBasic expose :artifacts_file, using: JobArtifactFile, if: -> (job, opts) { job.artifacts? } expose :runner, with: Runner + expose :artifacts_expire_at end class JobBasicWithProject < JobBasic |