From b35f24f225869c1006d5563ae68567c31e44ed1a Mon Sep 17 00:00:00 2001 From: manojmj Date: Mon, 13 Apr 2020 13:17:13 +0530 Subject: [PATCH] Add `group_owners_can_manage_default_branch_protection ` column This change adds `group_owners_can_manage_default_branch_protection ` column to `application_settings` table --- ...ng-to-enable-or-disable-default-branch.yml | 6 ++++++ ...anch_protection_to_application_settings.rb | 19 +++++++++++++++++++ db/structure.sql | 4 +++- 3 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 changelogs/unreleased/211944-provide-instance-level-setting-to-enable-or-disable-default-branch.yml create mode 100644 db/migrate/20200413072059_add_group_owners_can_manage_default_branch_protection_to_application_settings.rb diff --git a/changelogs/unreleased/211944-provide-instance-level-setting-to-enable-or-disable-default-branch.yml b/changelogs/unreleased/211944-provide-instance-level-setting-to-enable-or-disable-default-branch.yml new file mode 100644 index 00000000000000..51dd436e2a375c --- /dev/null +++ b/changelogs/unreleased/211944-provide-instance-level-setting-to-enable-or-disable-default-branch.yml @@ -0,0 +1,6 @@ +--- +title: Add a database column to enable or disable group owners from changing the default + branch protection setting of a group +merge_request: 29397 +author: +type: added diff --git a/db/migrate/20200413072059_add_group_owners_can_manage_default_branch_protection_to_application_settings.rb b/db/migrate/20200413072059_add_group_owners_can_manage_default_branch_protection_to_application_settings.rb new file mode 100644 index 00000000000000..eea564d00f439d --- /dev/null +++ b/db/migrate/20200413072059_add_group_owners_can_manage_default_branch_protection_to_application_settings.rb @@ -0,0 +1,19 @@ +# frozen_string_literal: true + +class AddGroupOwnersCanManageDefaultBranchProtectionToApplicationSettings < ActiveRecord::Migration[6.0] + include Gitlab::Database::MigrationHelpers + + DOWNTIME = false + disable_ddl_transaction! + + def up + add_column_with_default(:application_settings, + :group_owners_can_manage_default_branch_protection, + :boolean, + default: true) + end + + def down + remove_column :application_settings, :group_owners_can_manage_default_branch_protection + end +end diff --git a/db/structure.sql b/db/structure.sql index 15d9631e984bf5..2430df7984914a 100644 --- a/db/structure.sql +++ b/db/structure.sql @@ -400,7 +400,8 @@ CREATE TABLE public.application_settings ( seat_link_enabled boolean DEFAULT true NOT NULL, container_expiration_policies_enable_historic_entries boolean DEFAULT false NOT NULL, issues_create_limit integer DEFAULT 300 NOT NULL, - push_rule_id bigint + push_rule_id bigint, + group_owners_can_manage_default_branch_protection boolean DEFAULT true NOT NULL ); CREATE SEQUENCE public.application_settings_id_seq @@ -13198,6 +13199,7 @@ COPY "schema_migrations" (version) FROM STDIN; 20200408175424 20200409211607 20200410232012 +20200413072059 20200414144547 20200415160722 20200415161021 -- GitLab