diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2024-01-10 23:26:58 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2024-01-10 23:26:58 +0300 |
| commit | f57f7eebac215d23e6ca74d865bd19407cbaccba (patch) | |
| tree | 047cb0a0e66bf9afc512ed2f02fdbe2d5d65978b /db | |
| parent | 2965e48337030c75e342b72d3420b7ff69e11f08 (diff) | |
Add latest changes from gitlab-org/security/gitlab@16-7-stable-ee
Diffstat (limited to 'db')
| -rw-r--r-- | db/migrate/20231219120134_add_token_to_chat_names.rb | 12 | ||||
| -rw-r--r-- | db/schema_migrations/20231219120134 | 1 | ||||
| -rw-r--r-- | db/structure.sql | 4 |
3 files changed, 16 insertions, 1 deletions
diff --git a/db/migrate/20231219120134_add_token_to_chat_names.rb b/db/migrate/20231219120134_add_token_to_chat_names.rb new file mode 100644 index 00000000000..f35a6b812f3 --- /dev/null +++ b/db/migrate/20231219120134_add_token_to_chat_names.rb @@ -0,0 +1,12 @@ +# frozen_string_literal: true + +class AddTokenToChatNames < Gitlab::Database::Migration[2.2] + enable_lock_retries! + + milestone '16.7' + + def change + add_column :chat_names, :encrypted_token, :binary + add_column :chat_names, :encrypted_token_iv, :binary + end +end diff --git a/db/schema_migrations/20231219120134 b/db/schema_migrations/20231219120134 new file mode 100644 index 00000000000..3114ed90125 --- /dev/null +++ b/db/schema_migrations/20231219120134 @@ -0,0 +1 @@ +2d70891e636bdd68f5a3827e57cb3013cdcd92e9e2f3556ca9bbd04f2099b182
\ No newline at end of file diff --git a/db/structure.sql b/db/structure.sql index b429b3ab4f1..ac62920288a 100644 --- a/db/structure.sql +++ b/db/structure.sql @@ -13710,7 +13710,9 @@ CREATE TABLE chat_names ( chat_name character varying, last_used_at timestamp without time zone, created_at timestamp without time zone NOT NULL, - updated_at timestamp without time zone NOT NULL + updated_at timestamp without time zone NOT NULL, + encrypted_token bytea, + encrypted_token_iv bytea ); CREATE SEQUENCE chat_names_id_seq |