From 5725be9508df7922c77cfab4a6c5501548e5e3ca Mon Sep 17 00:00:00 2001 From: Bastian Blank Date: Sat, 30 Mar 2019 00:50:02 +0100 Subject: Display maximum artifact size from runtime config The maximum artifact size was moved into runtime config some time ago. Update the instance configuration code to read this value. --- app/models/instance_configuration.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/models/instance_configuration.rb') diff --git a/app/models/instance_configuration.rb b/app/models/instance_configuration.rb index 11289887e00..a9b1962f24c 100644 --- a/app/models/instance_configuration.rb +++ b/app/models/instance_configuration.rb @@ -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 -- cgit v1.2.1