diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-01-30 21:09:47 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-01-30 21:09:47 +0300 |
| commit | cd99e8611a6df11975c227517892606440ad3ff6 (patch) | |
| tree | aea53bef850be971e128b4be9649654d760b2b02 /db | |
| parent | 412fe7ab5511ec446f250d415d571108fe838b68 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'db')
| -rw-r--r-- | db/migrate/20230102180341_add_merge_request_meta_to_merge_requests_compliance_violations.rb | 10 | ||||
| -rw-r--r-- | db/schema_migrations/20230102180341 | 1 | ||||
| -rw-r--r-- | db/structure.sql | 6 |
3 files changed, 16 insertions, 1 deletions
diff --git a/db/migrate/20230102180341_add_merge_request_meta_to_merge_requests_compliance_violations.rb b/db/migrate/20230102180341_add_merge_request_meta_to_merge_requests_compliance_violations.rb new file mode 100644 index 00000000000..84e1994e91c --- /dev/null +++ b/db/migrate/20230102180341_add_merge_request_meta_to_merge_requests_compliance_violations.rb @@ -0,0 +1,10 @@ +# frozen_string_literal: true + +class AddMergeRequestMetaToMergeRequestsComplianceViolations < Gitlab::Database::Migration[2.1] + def change + add_column :merge_requests_compliance_violations, :merged_at, :datetime_with_timezone + add_column :merge_requests_compliance_violations, :target_project_id, :integer + add_column :merge_requests_compliance_violations, :title, :text # rubocop:disable Migration/AddLimitToTextColumns + add_column :merge_requests_compliance_violations, :target_branch, :text # rubocop:disable Migration/AddLimitToTextColumns + end +end diff --git a/db/schema_migrations/20230102180341 b/db/schema_migrations/20230102180341 new file mode 100644 index 00000000000..bc153e07b1a --- /dev/null +++ b/db/schema_migrations/20230102180341 @@ -0,0 +1 @@ +1ed2531b3655b46f67c523f4a588471b1b0cb291b24c9491e6efe89d644546d8
\ No newline at end of file diff --git a/db/structure.sql b/db/structure.sql index eedf798f980..6b4861110c4 100644 --- a/db/structure.sql +++ b/db/structure.sql @@ -17920,7 +17920,11 @@ CREATE TABLE merge_requests_compliance_violations ( violating_user_id bigint NOT NULL, merge_request_id bigint NOT NULL, reason smallint NOT NULL, - severity_level smallint DEFAULT 0 NOT NULL + severity_level smallint DEFAULT 0 NOT NULL, + merged_at timestamp with time zone, + target_project_id integer, + title text, + target_branch text ); CREATE SEQUENCE merge_requests_compliance_violations_id_seq |