diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2024-01-17 12:08:04 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2024-01-17 12:08:04 +0300 |
| commit | f4cab593243c89a6e22a546d253a546e0d1174af (patch) | |
| tree | 84e195ef03fa8c4e2e2242d55b3822956f852fe9 /db | |
| parent | 172e4a12748fd146fdd0e9eca12ade4c51dabda9 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'db')
| -rw-r--r-- | db/post_migrate/20240116131144_remove_application_settings_ai_access_token_column_corrected.rb | 15 | ||||
| -rw-r--r-- | db/schema_migrations/20240116131144 | 1 | ||||
| -rw-r--r-- | db/structure.sql | 2 |
3 files changed, 16 insertions, 2 deletions
diff --git a/db/post_migrate/20240116131144_remove_application_settings_ai_access_token_column_corrected.rb b/db/post_migrate/20240116131144_remove_application_settings_ai_access_token_column_corrected.rb new file mode 100644 index 00000000000..25e3f8fa806 --- /dev/null +++ b/db/post_migrate/20240116131144_remove_application_settings_ai_access_token_column_corrected.rb @@ -0,0 +1,15 @@ +# frozen_string_literal: true + +class RemoveApplicationSettingsAiAccessTokenColumnCorrected < Gitlab::Database::Migration[2.2] + milestone '16.9' + + def up + remove_column :application_settings, :encrypted_ai_access_token, if_exists: true + remove_column :application_settings, :encrypted_ai_access_token_iv, if_exists: true + end + + def down + add_column :application_settings, :encrypted_ai_access_token, :binary, if_not_exists: true + add_column :application_settings, :encrypted_ai_access_token_iv, :binary, if_not_exists: true + end +end diff --git a/db/schema_migrations/20240116131144 b/db/schema_migrations/20240116131144 new file mode 100644 index 00000000000..bd01219df01 --- /dev/null +++ b/db/schema_migrations/20240116131144 @@ -0,0 +1 @@ +f10ce3c873e430283102232bf1830eda9a746b42862566500e05f6725988a21d
\ No newline at end of file diff --git a/db/structure.sql b/db/structure.sql index e2ff22c7a0f..10e32e7cdca 100644 --- a/db/structure.sql +++ b/db/structure.sql @@ -12584,8 +12584,6 @@ CREATE TABLE application_settings ( wiki_asciidoc_allow_uri_includes boolean DEFAULT false NOT NULL, namespace_aggregation_schedule_lease_duration_in_seconds integer DEFAULT 300 NOT NULL, container_registry_data_repair_detail_worker_max_concurrency integer DEFAULT 2 NOT NULL, - encrypted_ai_access_token bytea, - encrypted_ai_access_token_iv bytea, vertex_ai_host text, encrypted_vertex_ai_credentials bytea, encrypted_vertex_ai_credentials_iv bytea, |