diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2019-04-08 15:38:35 +0100 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2019-04-08 15:38:35 +0100 |
| commit | 05d46d0568170e8c613df7fc2dfa7d611b33f9a0 (patch) | |
| tree | f59abdb4bb4b24dc4cc7212eed682149e2457fd4 /app/models/instance_configuration.rb | |
| parent | 383e8b1ed103def3aff37a409bb8619b55720398 (diff) | |
| parent | 34f68b3e35bbfa35cb831c16643eadb4dda70039 (diff) | |
| download | gitlab-ce-59708-vendor-css.tar.gz | |
Merge branch 'master' into 59708-vendor-css59708-vendor-css
* master:
Docs: Fix anchors related to variables doc
Add usefull tips about big repositories
Adds EE folder in the stylelint command
Display maximum artifact size from runtime config
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 |