diff options
| author | Clement Ho <clemmakesapps@gmail.com> | 2018-05-29 14:21:28 +0000 |
|---|---|---|
| committer | Clement Ho <clemmakesapps@gmail.com> | 2018-05-29 14:21:28 +0000 |
| commit | c1717225c2157d00658333376f1362d4084999cb (patch) | |
| tree | ad65fe748d57a7344b13a9e90816b33529e24556 /lib/api/entities.rb | |
| parent | 88f28e0ec8259082a16636bbf2247e14eee927a0 (diff) | |
| parent | 4c74936f4567ba142bcd9ca31c8f5f10c8aa52fa (diff) | |
| download | gitlab-ce-bootstrap-fixes-from-ee.tar.gz | |
Merge branch 'master' into 'bootstrap-fixes-from-ee'bootstrap-fixes-from-ee
# Conflicts:
# app/assets/javascripts/jobs/components/sidebar_details_block.vue
Diffstat (limited to 'lib/api/entities.rb')
| -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 |