diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-01-28 15:09:54 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-01-28 15:09:54 +0300 |
| commit | 8c2b139cf778cd1d152f06bbc090a4313f975b81 (patch) | |
| tree | 94f3ffd7fdb2accb77ceb39b61189d22ec6efdc0 /db | |
| parent | 263f33af2d69b38023c703d274568e2a6da21dee (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'db')
| -rw-r--r-- | db/migrate/20210118111307_add_enforce_ssh_key_expiration_to_application_settings.rb | 9 | ||||
| -rw-r--r-- | db/schema_migrations/20210118111307 | 1 | ||||
| -rw-r--r-- | db/structure.sql | 1 |
3 files changed, 11 insertions, 0 deletions
diff --git a/db/migrate/20210118111307_add_enforce_ssh_key_expiration_to_application_settings.rb b/db/migrate/20210118111307_add_enforce_ssh_key_expiration_to_application_settings.rb new file mode 100644 index 00000000000..fd1ed4f207b --- /dev/null +++ b/db/migrate/20210118111307_add_enforce_ssh_key_expiration_to_application_settings.rb @@ -0,0 +1,9 @@ +# frozen_string_literal: true + +class AddEnforceSshKeyExpirationToApplicationSettings < ActiveRecord::Migration[6.0] + DOWNTIME = false + + def change + add_column :application_settings, :enforce_ssh_key_expiration, :boolean, default: false, null: false + end +end diff --git a/db/schema_migrations/20210118111307 b/db/schema_migrations/20210118111307 new file mode 100644 index 00000000000..036d909f5ad --- /dev/null +++ b/db/schema_migrations/20210118111307 @@ -0,0 +1 @@ +f33cc3eebc9197db381d81150a140582e30905d3964d6fb444caad6c9eff1b31
\ No newline at end of file diff --git a/db/structure.sql b/db/structure.sql index e2da9b2159d..5f79e25f3e8 100644 --- a/db/structure.sql +++ b/db/structure.sql @@ -9410,6 +9410,7 @@ CREATE TABLE application_settings ( rate_limiting_response_text text, invisible_captcha_enabled boolean DEFAULT false NOT NULL, container_registry_cleanup_tags_service_max_list_size integer DEFAULT 200 NOT NULL, + enforce_ssh_key_expiration boolean DEFAULT false 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_registry_exp_policies_worker_capacity_positive CHECK ((container_registry_expiration_policies_worker_capacity >= 0)), CONSTRAINT check_17d9558205 CHECK ((char_length((kroki_url)::text) <= 1024)), |