Add latest changes from gitlab-org/gitlab@13-10-stable-eev13.10.0-rc40

1 files changed, 14 insertions, 0 deletions

diff --git a/db/migrate/20210310111009_add_settings_to_group_merge_request_approval_settings.rb b/db/migrate/20210310111009_add_settings_to_group_merge_request_approval_settings.rb
new file mode 100644
index 00000000000..088f400efb9
--- /dev/null
+++ b/db/migrate/20210310111009_add_settings_to_group_merge_request_approval_settings.rb
@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+class AddSettingsToGroupMergeRequestApprovalSettings < ActiveRecord::Migration[6.0]
+  DOWNTIME = false
+
+  def change
+    change_table(:group_merge_request_approval_settings, bulk: true) do |t|
+      t.column :allow_committer_approval, :boolean, null: false, default: false
+      t.column :allow_overrides_to_approver_list_per_merge_request, :boolean, null: false, default: false
+      t.column :retain_approvals_on_push, :boolean, null: false, default: false
+      t.column :require_password_to_approve, :boolean, null: false, default: false
+    end
+  end
+end