diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-04-01 06:08:54 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-04-01 06:08:54 +0300 |
commit | c50b444ebb2a379a8b30528c634d02afd58b7b41 (patch) | |
tree | ce507b043e0a5952be7bb2845195abed29239831 /db | |
parent | bd98eab3fac88fdde059fafc59bc59b150b56d43 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'db')
-rw-r--r-- | db/migrate/20230331142006_add_open_ai_api_key_application_setting.rb | 8 | ||||
-rw-r--r-- | db/schema_migrations/20230331142006 | 1 | ||||
-rw-r--r-- | db/structure.sql | 2 |
3 files changed, 11 insertions, 0 deletions
diff --git a/db/migrate/20230331142006_add_open_ai_api_key_application_setting.rb b/db/migrate/20230331142006_add_open_ai_api_key_application_setting.rb new file mode 100644 index 00000000000..735cb414c99 --- /dev/null +++ b/db/migrate/20230331142006_add_open_ai_api_key_application_setting.rb @@ -0,0 +1,8 @@ +# frozen_string_literal: true + +class AddOpenAiApiKeyApplicationSetting < Gitlab::Database::Migration[2.1] + def change + add_column :application_settings, :encrypted_openai_api_key, :binary + add_column :application_settings, :encrypted_openai_api_key_iv, :binary + end +end diff --git a/db/schema_migrations/20230331142006 b/db/schema_migrations/20230331142006 new file mode 100644 index 00000000000..be84e6af217 --- /dev/null +++ b/db/schema_migrations/20230331142006 @@ -0,0 +1 @@ +73b3a7fa20bb22756e9e16f489c0743920c3342c6fc5a70cffafad84016873ab
\ No newline at end of file diff --git a/db/structure.sql b/db/structure.sql index 097df5b5e32..4af994590ad 100644 --- a/db/structure.sql +++ b/db/structure.sql @@ -11754,6 +11754,8 @@ CREATE TABLE application_settings ( gitlab_dedicated_instance boolean DEFAULT false NOT NULL, update_runner_versions_enabled boolean DEFAULT true NOT NULL, database_apdex_settings jsonb, + encrypted_openai_api_key bytea, + encrypted_openai_api_key_iv bytea, CONSTRAINT app_settings_container_reg_cleanup_tags_max_list_size_positive CHECK ((container_registry_cleanup_tags_service_max_list_size >= 0)), CONSTRAINT app_settings_container_registry_pre_import_tags_rate_positive CHECK ((container_registry_pre_import_tags_rate >= (0)::numeric)), CONSTRAINT app_settings_dep_proxy_ttl_policies_worker_capacity_positive CHECK ((dependency_proxy_ttl_group_policy_worker_capacity >= 0)), |