From b60a6e4830bea094016f1f906c69c575002aee0d Mon Sep 17 00:00:00 2001 From: Yorick Peterse Date: Tue, 18 Jun 2019 14:09:54 +0000 Subject: [PATCH] Merge branch 'backport-report_approver-migration-to-ce' into 'master' Backport approval MR rules report_type migration to CE See merge request gitlab-org/gitlab-ce!29766 (cherry picked from commit 53036a5bc6dcdc120ce828e3366be8b4486f9a6a) 5d76e091 Backport approval MR rules report_type migration to CE --- ...d_report_type_to_approval_merge_request_rules.rb | 13 +++++++++++++ db/schema.rb | 1 + 2 files changed, 14 insertions(+) create mode 100644 db/migrate/20190521174505_add_report_type_to_approval_merge_request_rules.rb diff --git a/db/migrate/20190521174505_add_report_type_to_approval_merge_request_rules.rb b/db/migrate/20190521174505_add_report_type_to_approval_merge_request_rules.rb new file mode 100644 index 00000000000..eafffd4f5a3 --- /dev/null +++ b/db/migrate/20190521174505_add_report_type_to_approval_merge_request_rules.rb @@ -0,0 +1,13 @@ +# frozen_string_literal: true + +class AddReportTypeToApprovalMergeRequestRules < ActiveRecord::Migration[5.1] + include Gitlab::Database::MigrationHelpers + + DOWNTIME = false + + def change + change_table :approval_merge_request_rules do |t| + t.integer :report_type, limit: 2 + end + end +end diff --git a/db/schema.rb b/db/schema.rb index 09ac2eeb84c..42298104855 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -248,6 +248,7 @@ ActiveRecord::Schema.define(version: 20190611161641) do t.boolean "code_owner", default: false, null: false t.string "name", null: false t.integer "rule_type", limit: 2, default: 1, null: false + t.integer "report_type", limit: 2 t.index ["merge_request_id", "code_owner", "name"], name: "approval_rule_name_index_for_code_owners", unique: true, where: "(code_owner = true)", using: :btree t.index ["merge_request_id", "code_owner"], name: "index_approval_merge_request_rules_1", using: :btree t.index ["merge_request_id", "rule_type", "name"], name: "index_approval_rule_name_for_code_owners_rule_type", unique: true, where: "(rule_type = 2)", using: :btree -- GitLab