Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2021-09-01 06:11:03 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2021-09-01 06:11:03 +0300
commita3c1c29aa588228a2ae9c000620d1b73ff159fe3 (patch)
tree780805b1255c831569dfb1f43e1ac0f80917d8be /app/models/application_setting_implementation.rb
parent74dae34e98c5a321b152083022e7c210e875168c (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models/application_setting_implementation.rb')
-rw-r--r--app/models/application_setting_implementation.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/app/models/application_setting_implementation.rb b/app/models/application_setting_implementation.rb
index 5dfe9f922fd..c194bafeee3 100644
--- a/app/models/application_setting_implementation.rb
+++ b/app/models/application_setting_implementation.rb
@@ -109,6 +109,8 @@ module ApplicationSettingImplementation
max_artifacts_size: Settings.artifacts['max_size'],
max_attachment_size: Settings.gitlab['max_attachment_size'],
max_import_size: 0,
+ max_yaml_size_bytes: 1.megabyte,
+ max_yaml_depth: 100,
minimum_password_length: DEFAULT_MINIMUM_PASSWORD_LENGTH,
mirror_available: true,
notes_create_limit: 300,