diff options
| author | Rémy Coutable <remy@rymai.me> | 2019-04-08 12:55:27 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2019-04-08 12:55:27 +0000 |
| commit | 2fa3b9846e2c81079f0bb3af1ec1ab53c6e1929b (patch) | |
| tree | c066632bed2d3f6d983b3f53e38a61d90864336d /app/models | |
| parent | 8122bc52c783029e898ad9a12ca9fbe236c9b7d6 (diff) | |
| parent | 5725be9508df7922c77cfab4a6c5501548e5e3ca (diff) | |
| download | gitlab-ce-2fa3b9846e2c81079f0bb3af1ec1ab53c6e1929b.tar.gz | |
Merge branch 'instance-configuration-artifact-size' into 'master'
Display maximum artifact size from runtime config
See merge request gitlab-org/gitlab-ce!26784
Diffstat (limited to 'app/models')
| -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 |