diff options
| author | Bastian Blank <waldi@debian.org> | 2019-03-30 00:50:02 +0100 |
|---|---|---|
| committer | Bastian Blank <waldi@debian.org> | 2019-04-03 21:02:11 +0200 |
| commit | 5725be9508df7922c77cfab4a6c5501548e5e3ca (patch) | |
| tree | 252c1c9c362ff9a913cf0c8824660cea962c7a3e /app/models/instance_configuration.rb | |
| parent | ee72dc1b34d893662fe0cb7793a1a960312b1f48 (diff) | |
| download | gitlab-ce-5725be9508df7922c77cfab4a6c5501548e5e3ca.tar.gz | |
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.
Diffstat (limited to 'app/models/instance_configuration.rb')
| -rw-r--r-- | app/models/instance_configuration.rb | 2 |
1 files changed, 1 insertions, 1 deletions
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 |