diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-08 12:06:01 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-08 12:06:01 +0000 |
| commit | 9865665cb15a1f63e6c4d0623d33b8ef11810f8d (patch) | |
| tree | 25458d0f21cf25896af750ed6933bbc4efcdb909 /lib/api/helpers | |
| parent | 77a7772c3bdb03d92cbc154f6b1a762953cc7c19 (diff) | |
| download | gitlab-ce-9865665cb15a1f63e6c4d0623d33b8ef11810f8d.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/api/helpers')
| -rw-r--r-- | lib/api/helpers/runner.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/api/helpers/runner.rb b/lib/api/helpers/runner.rb index 11631378137..fa8b9ad79bd 100644 --- a/lib/api/helpers/runner.rb +++ b/lib/api/helpers/runner.rb @@ -59,8 +59,9 @@ module API token && job.valid_token?(token) end - def max_artifacts_size - Gitlab::CurrentSettings.max_artifacts_size.megabytes.to_i + def max_artifacts_size(job) + max_size = job.project.closest_setting(:max_artifacts_size) + max_size.megabytes.to_i end def job_forbidden!(job, reason) |