diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-05-12 18:08:59 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-05-12 18:08:59 +0300 |
| commit | 0024c2f44455cf5ace9235a7efa195c12a1d72d2 (patch) | |
| tree | 72d2e7d8f03fd479b8b3ca9915d12d116d37948f /db | |
| parent | cb3b9f9243555b0c26145e2992a9f01f7fa47bf5 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'db')
| -rw-r--r-- | db/migrate/20220511191502_add_registry_migration_guard_thresholds_to_application_settings.rb | 15 | ||||
| -rw-r--r-- | db/schema_migrations/20220511191502 | 1 | ||||
| -rw-r--r-- | db/structure.sql | 2 |
3 files changed, 18 insertions, 0 deletions
diff --git a/db/migrate/20220511191502_add_registry_migration_guard_thresholds_to_application_settings.rb b/db/migrate/20220511191502_add_registry_migration_guard_thresholds_to_application_settings.rb new file mode 100644 index 00000000000..87a29bd5889 --- /dev/null +++ b/db/migrate/20220511191502_add_registry_migration_guard_thresholds_to_application_settings.rb @@ -0,0 +1,15 @@ +# frozen_string_literal: true + +class AddRegistryMigrationGuardThresholdsToApplicationSettings < Gitlab::Database::Migration[2.0] + def change + add_column :application_settings, :container_registry_pre_import_timeout, + :integer, + default: 30.minutes, + null: false + + add_column :application_settings, :container_registry_import_timeout, + :integer, + default: 10.minutes, + null: false + end +end diff --git a/db/schema_migrations/20220511191502 b/db/schema_migrations/20220511191502 new file mode 100644 index 00000000000..caebd721aa6 --- /dev/null +++ b/db/schema_migrations/20220511191502 @@ -0,0 +1 @@ +432214f4683800e1f5b5e42d05d9a6de07c317fec0dffd6b1eb312ccfd437e0c
\ No newline at end of file diff --git a/db/structure.sql b/db/structure.sql index 19de1d7ba2f..61a95095e34 100644 --- a/db/structure.sql +++ b/db/structure.sql @@ -11292,6 +11292,8 @@ CREATE TABLE application_settings ( delayed_group_deletion boolean DEFAULT true NOT NULL, arkose_labs_namespace text DEFAULT 'client'::text NOT NULL, max_export_size integer DEFAULT 0, + container_registry_pre_import_timeout integer DEFAULT 1800 NOT NULL, + container_registry_import_timeout integer DEFAULT 600 NOT NULL, CONSTRAINT app_settings_container_reg_cleanup_tags_max_list_size_positive CHECK ((container_registry_cleanup_tags_service_max_list_size >= 0)), CONSTRAINT app_settings_dep_proxy_ttl_policies_worker_capacity_positive CHECK ((dependency_proxy_ttl_group_policy_worker_capacity >= 0)), CONSTRAINT app_settings_ext_pipeline_validation_service_url_text_limit CHECK ((char_length(external_pipeline_validation_service_url) <= 255)), |