diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-05-12 15:08:59 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-05-12 15:08:59 +0000 |
| commit | 0024c2f44455cf5ace9235a7efa195c12a1d72d2 (patch) | |
| tree | 72d2e7d8f03fd479b8b3ca9915d12d116d37948f /app/models | |
| parent | cb3b9f9243555b0c26145e2992a9f01f7fa47bf5 (diff) | |
| download | gitlab-ce-0024c2f44455cf5ace9235a7efa195c12a1d72d2.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/application_setting.rb | 2 | ||||
| -rw-r--r-- | app/models/application_setting_implementation.rb | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/app/models/application_setting.rb b/app/models/application_setting.rb index bf68101934b..d40f3784fa1 100644 --- a/app/models/application_setting.rb +++ b/app/models/application_setting.rb @@ -377,6 +377,8 @@ class ApplicationSetting < ApplicationRecord :container_registry_import_max_retries, :container_registry_import_start_max_retries, :container_registry_import_max_step_duration, + :container_registry_pre_import_timeout, + :container_registry_import_timeout, allow_nil: false, numericality: { only_integer: true, greater_than_or_equal_to: 0 } diff --git a/app/models/application_setting_implementation.rb b/app/models/application_setting_implementation.rb index 36366b375b9..a54dc4f691d 100644 --- a/app/models/application_setting_implementation.rb +++ b/app/models/application_setting_implementation.rb @@ -224,6 +224,8 @@ module ApplicationSettingImplementation container_registry_import_max_retries: 3, container_registry_import_start_max_retries: 50, container_registry_import_max_step_duration: 5.minutes, + container_registry_pre_import_timeout: 30.minutes, + container_registry_import_timeout: 10.minutes, container_registry_import_target_plan: 'free', container_registry_import_created_before: '2022-01-23 00:00:00', kroki_enabled: false, |