diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2017-02-24 11:26:44 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-02-24 11:26:44 +0000 |
| commit | 806c748852e7d62dfa13fd2d039949ce0f875a12 (patch) | |
| tree | ad2142c9c63d3a3aca7d71a048bda460b1767389 /lib/ci/api/builds.rb | |
| parent | a82e3d30b2ef625dae0d2f25324460402f960f09 (diff) | |
| parent | f40403cce1a8185254e74dff54ee687b7953093b (diff) | |
| download | gitlab-ce-api-remove-owned-groups.tar.gz | |
Merge branch 'master' into 'api-remove-owned-groups'api-remove-owned-groups
# Conflicts:
# doc/api/v3_to_v4.md
Diffstat (limited to 'lib/ci/api/builds.rb')
| -rw-r--r-- | lib/ci/api/builds.rb | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/ci/api/builds.rb b/lib/ci/api/builds.rb index 8b939663ffd..0e17ac24d5a 100644 --- a/lib/ci/api/builds.rb +++ b/lib/ci/api/builds.rb @@ -167,7 +167,10 @@ module Ci build.artifacts_file = artifacts build.artifacts_metadata = metadata - build.artifacts_expire_in = params['expire_in'] + build.artifacts_expire_in = + params['expire_in'] || + Gitlab::CurrentSettings.current_application_settings + .default_artifacts_expire_in if build.save present(build, with: Entities::BuildDetails) |