diff --git a/db/migrate/20221009085130_add_mr_checks_columns_to_namespace_settings.rb b/db/migrate/20221009085130_add_mr_checks_columns_to_namespace_settings.rb new file mode 100644 index 0000000000000000000000000000000000000000..947a662575a7511ef578273accc37894ea7f8f12 --- /dev/null +++ b/db/migrate/20221009085130_add_mr_checks_columns_to_namespace_settings.rb @@ -0,0 +1,10 @@ +# frozen_string_literal: true + +class AddMrChecksColumnsToNamespaceSettings < Gitlab::Database::Migration[2.0] + def change + add_column :namespace_settings, :only_allow_merge_if_pipeline_succeeds, :boolean, default: false, null: false + add_column :namespace_settings, :allow_merge_on_skipped_pipeline, :boolean, default: false, null: false + add_column :namespace_settings, :only_allow_merge_if_all_discussions_are_resolved, \ + :boolean, default: false, null: false + end +end diff --git a/db/schema_migrations/20221009085130 b/db/schema_migrations/20221009085130 new file mode 100644 index 0000000000000000000000000000000000000000..cbdfb3014cdc43e5b262d50b82e60b2673c06de0 --- /dev/null +++ b/db/schema_migrations/20221009085130 @@ -0,0 +1 @@ +125ce9bf81966840774eb69be7995c1a8e2abd901fe5f19b73df43a577a9dc44 \ No newline at end of file diff --git a/db/structure.sql b/db/structure.sql index 5db8614c868f9ff3486805586e3c0d1bbaaf9ffb..3d607b2ea405e328e9e5c87f9d15638f69125c78 100644 --- a/db/structure.sql +++ b/db/structure.sql @@ -17925,6 +17925,9 @@ CREATE TABLE namespace_settings ( include_for_free_user_cap_preview boolean DEFAULT false NOT NULL, unique_project_download_limit_allowlist text[] DEFAULT '{}'::text[] NOT NULL, auto_ban_user_on_excessive_projects_download boolean DEFAULT false NOT NULL, + only_allow_merge_if_pipeline_succeeds boolean DEFAULT false NOT NULL, + allow_merge_on_skipped_pipeline boolean DEFAULT false NOT NULL, + only_allow_merge_if_all_discussions_are_resolved boolean DEFAULT false NOT NULL, CONSTRAINT check_0ba93c78c7 CHECK ((char_length(default_branch_name) <= 255)), CONSTRAINT namespace_settings_unique_project_download_limit_allowlist_size CHECK ((cardinality(unique_project_download_limit_allowlist) <= 100)) );