diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-02-02 12:09:24 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-02-02 12:09:24 +0300 |
| commit | 0c178b535cda98a248e136ba5128f0d903edb17d (patch) | |
| tree | 7634da4d37b8734e6a20221caf485877040eef77 /db | |
| parent | bcd0f3a2f6bd59a9de40f5a9f2829cec3d456207 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'db')
| -rw-r--r-- | db/migrate/20210128044930_add_git_two_factor_session_expiry_to_application_settings.rb | 9 | ||||
| -rw-r--r-- | db/schema_migrations/20210128044930 | 1 | ||||
| -rw-r--r-- | db/structure.sql | 1 |
3 files changed, 11 insertions, 0 deletions
diff --git a/db/migrate/20210128044930_add_git_two_factor_session_expiry_to_application_settings.rb b/db/migrate/20210128044930_add_git_two_factor_session_expiry_to_application_settings.rb new file mode 100644 index 00000000000..77a1dd2131b --- /dev/null +++ b/db/migrate/20210128044930_add_git_two_factor_session_expiry_to_application_settings.rb @@ -0,0 +1,9 @@ +# frozen_string_literal: true + +class AddGitTwoFactorSessionExpiryToApplicationSettings < ActiveRecord::Migration[6.0] + DOWNTIME = false + + def change + add_column :application_settings, :git_two_factor_session_expiry, :integer, default: 15, null: false + end +end diff --git a/db/schema_migrations/20210128044930 b/db/schema_migrations/20210128044930 new file mode 100644 index 00000000000..4965cd9a9c6 --- /dev/null +++ b/db/schema_migrations/20210128044930 @@ -0,0 +1 @@ +6164ef91c60bd614310cbda6ad8ab1a205cae17c4d037fafa89eaf95d06323e4
\ No newline at end of file diff --git a/db/structure.sql b/db/structure.sql index 91242ef5799..704ba281d49 100644 --- a/db/structure.sql +++ b/db/structure.sql @@ -9411,6 +9411,7 @@ CREATE TABLE application_settings ( 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, + git_two_factor_session_expiry integer DEFAULT 15 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)), |