diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-12-12 18:13:14 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-12-12 18:13:14 +0300 |
commit | 86a3b1b3ae2115c6ab7b9d492e9c89ac70963d3a (patch) | |
tree | c78266705382f28d08786303ea57525ec1e2a2cf /db | |
parent | 7045d3816aa7bab6619e9d841f45d5cb8d454f23 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'db')
9 files changed, 61 insertions, 2 deletions
diff --git a/db/docs/batched_background_migrations/backfill_dismissal_reason_in_vulnerability_reads.yml b/db/docs/batched_background_migrations/backfill_dismissal_reason_in_vulnerability_reads.yml index 1f76acc4def..4e845f41c32 100644 --- a/db/docs/batched_background_migrations/backfill_dismissal_reason_in_vulnerability_reads.yml +++ b/db/docs/batched_background_migrations/backfill_dismissal_reason_in_vulnerability_reads.yml @@ -6,3 +6,4 @@ feature_category: vulnerability_management introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/123518 queued_migration_version: 20230612232000 milestone: '16.1' +finalized_by: '20231207163648' diff --git a/db/docs/batched_background_migrations/fix_allow_descendants_override_disabled_shared_runners.yml b/db/docs/batched_background_migrations/fix_allow_descendants_override_disabled_shared_runners.yml index fc69b1eb934..1fec979899b 100644 --- a/db/docs/batched_background_migrations/fix_allow_descendants_override_disabled_shared_runners.yml +++ b/db/docs/batched_background_migrations/fix_allow_descendants_override_disabled_shared_runners.yml @@ -1,6 +1,8 @@ --- migration_job_name: FixAllowDescendantsOverrideDisabledSharedRunners -description: Clears invalid combination of shared runners settings (fixes subgroup creation) +description: Clears invalid combination of shared runners settings (fixes subgroup + creation) feature_category: runner_fleet introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/128112 milestone: '16.3' +finalized_by: '20231207221159' diff --git a/db/migrate/20231114152304_add_approver_to_notification_settings.rb b/db/migrate/20231114152304_add_approver_to_notification_settings.rb new file mode 100644 index 00000000000..aaa9405532d --- /dev/null +++ b/db/migrate/20231114152304_add_approver_to_notification_settings.rb @@ -0,0 +1,10 @@ +# frozen_string_literal: true + +class AddApproverToNotificationSettings < Gitlab::Database::Migration[2.2] + milestone '16.7' + enable_lock_retries! + + def change + add_column :notification_settings, :approver, :boolean, default: false, null: false + end +end diff --git a/db/post_migrate/20231207163648_re_finalize_backfill_dismissal_reason_in_vulnerability_reads.rb b/db/post_migrate/20231207163648_re_finalize_backfill_dismissal_reason_in_vulnerability_reads.rb new file mode 100644 index 00000000000..fcfa50c8f32 --- /dev/null +++ b/db/post_migrate/20231207163648_re_finalize_backfill_dismissal_reason_in_vulnerability_reads.rb @@ -0,0 +1,21 @@ +# frozen_string_literal: true + +class ReFinalizeBackfillDismissalReasonInVulnerabilityReads < Gitlab::Database::Migration[2.2] + milestone '16.7' + + disable_ddl_transaction! + + restrict_gitlab_migration gitlab_schema: :gitlab_main + + def up + ensure_batched_background_migration_is_finished( + job_class_name: 'BackfillDismissalReasonInVulnerabilityReads', + table_name: :vulnerability_reads, + column_name: :id, + job_arguments: [], + finalize: true + ) + end + + def down; end +end diff --git a/db/post_migrate/20231207221159_finalize_fix_allow_descendants_override_disabled_shared_runners.rb b/db/post_migrate/20231207221159_finalize_fix_allow_descendants_override_disabled_shared_runners.rb new file mode 100644 index 00000000000..86dead2c54e --- /dev/null +++ b/db/post_migrate/20231207221159_finalize_fix_allow_descendants_override_disabled_shared_runners.rb @@ -0,0 +1,21 @@ +# frozen_string_literal: true + +class FinalizeFixAllowDescendantsOverrideDisabledSharedRunners < Gitlab::Database::Migration[2.2] + milestone '16.7' + + disable_ddl_transaction! + + restrict_gitlab_migration gitlab_schema: :gitlab_main + + def up + ensure_batched_background_migration_is_finished( + job_class_name: 'FixAllowDescendantsOverrideDisabledSharedRunners', + table_name: :namespaces, + column_name: :id, + job_arguments: [], + finalize: true + ) + end + + def down; end +end diff --git a/db/schema_migrations/20231114152304 b/db/schema_migrations/20231114152304 new file mode 100644 index 00000000000..61092255023 --- /dev/null +++ b/db/schema_migrations/20231114152304 @@ -0,0 +1 @@ +1d95078648a6fde73287b5a90c66143669cbde10836e3a1457ded5d3decb0266
\ No newline at end of file diff --git a/db/schema_migrations/20231207163648 b/db/schema_migrations/20231207163648 new file mode 100644 index 00000000000..24a47db3349 --- /dev/null +++ b/db/schema_migrations/20231207163648 @@ -0,0 +1 @@ +1d8d015245c8e8951f53b5e925cd1f47aa85aec001f738d7456aff4225ead951
\ No newline at end of file diff --git a/db/schema_migrations/20231207221159 b/db/schema_migrations/20231207221159 new file mode 100644 index 00000000000..a0b072bdd4d --- /dev/null +++ b/db/schema_migrations/20231207221159 @@ -0,0 +1 @@ +2a81b952d0db20a477204dbecfeff94af3df0c1b1373eef4b5276f215f6257e9
\ No newline at end of file diff --git a/db/structure.sql b/db/structure.sql index ed7fb02520d..3e55c8ff615 100644 --- a/db/structure.sql +++ b/db/structure.sql @@ -19759,7 +19759,8 @@ CREATE TABLE notification_settings ( new_release boolean, moved_project boolean DEFAULT true NOT NULL, change_reviewer_merge_request boolean, - merge_when_pipeline_succeeds boolean DEFAULT false NOT NULL + merge_when_pipeline_succeeds boolean DEFAULT false NOT NULL, + approver boolean DEFAULT false NOT NULL ); CREATE SEQUENCE notification_settings_id_seq |