diff options
| author | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-06-10 14:26:31 +0200 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2016-06-13 11:03:30 +0100 |
| commit | 86800bf51aec25eef970eac82838bcba087703f8 (patch) | |
| tree | 4012d038222bfbf812181a10c65aca32269ca290 /lib/ci/api | |
| parent | 1501940ee0452f01acc5a228df17928e2f91cf39 (diff) | |
| download | gitlab-ce-86800bf51aec25eef970eac82838bcba087703f8.tar.gz | |
Support expiration date in CI API when uploading artifacts
Diffstat (limited to 'lib/ci/api')
| -rw-r--r-- | lib/ci/api/builds.rb | 2 | ||||
| -rw-r--r-- | lib/ci/api/entities.rb | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/lib/ci/api/builds.rb b/lib/ci/api/builds.rb index 54f5626c7d7..9f270f7b387 100644 --- a/lib/ci/api/builds.rb +++ b/lib/ci/api/builds.rb @@ -146,7 +146,7 @@ module Ci build.artifacts_file = artifacts build.artifacts_metadata = metadata - build.artifacts_expire_at = Time.now + ChronicDuration.parse(params['expire_in']) + build.artifacts_expire_in = params['expire_in'] if build.save present(build, with: Entities::BuildDetails) diff --git a/lib/ci/api/entities.rb b/lib/ci/api/entities.rb index a902ced35d7..352d92e7cc0 100644 --- a/lib/ci/api/entities.rb +++ b/lib/ci/api/entities.rb @@ -29,6 +29,7 @@ module Ci expose :before_sha expose :allow_git_fetch expose :token + expose :artifacts_expire_at, if: lambda { |build, opts| build.artifacts? } expose :options do |model| model.options |