kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Merge branch 'instance-configuration-artifact-size' into 'master' 

Display maximum artifact size from runtime config

See merge request gitlab-org/gitlab-ce!26784
This commit is contained in:
Rémy Coutable 2019-04-08 12:55:27 +00:00
parent 8122bc52c7 5725be9508
commit 2fa3b9846e
3 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/instance_configuration.rb
View File

@ -39,7 +39,7 @@ class InstanceConfiguration
def gitlab_ci
Settings.gitlab_ci
.to_h
.merge(artifacts_max_size: { value: Settings.artifacts.max_size&.megabytes,
.merge(artifacts_max_size: { value: Gitlab::CurrentSettings.max_artifacts_size.megabytes,
default: 100.megabytes })
end

5
changelogs/unreleased/instance-configuration-artifact-size.yml Normal file
View File

@ -0,0 +1,5 @@
---
title: Display maximum artifact size from runtime config
merge_request: 26784
author: Bastian Blank
type: fixed

7
spec/models/instance_configuration_spec.rb
View File

@ -82,6 +82,13 @@ describe InstanceConfiguration do
it 'returns the key artifacts_max_size' do
expect(gitlab_ci.keys).to include(:artifacts_max_size)
end
it 'returns the key artifacts_max_size with values' do
stub_application_setting(max_artifacts_size: 200)
expect(gitlab_ci[:artifacts_max_size][:default]).to eq(100.megabytes)
expect(gitlab_ci[:artifacts_max_size][:value]).to eq(200.megabytes)
end
end
end
end