From df778038981ae49cb7c0fec0a60f89abf801c5f0 Mon Sep 17 00:00:00 2001
From: Nick Thomas <nick@gitlab.com>
Date: Fri, 12 Apr 2019 17:08:04 +0100
Subject: [PATCH] Backport of initial merge request blocks support

---
 ...20190412155659_add_merge_request_blocks.rb | 25 +++++++++++++++++++
 db/schema.rb                                  | 11 ++++++++
 2 files changed, 36 insertions(+)
 create mode 100644 db/migrate/20190412155659_add_merge_request_blocks.rb

diff --git a/db/migrate/20190412155659_add_merge_request_blocks.rb b/db/migrate/20190412155659_add_merge_request_blocks.rb
new file mode 100644
index 00000000000..9e7f370d1cf
--- /dev/null
+++ b/db/migrate/20190412155659_add_merge_request_blocks.rb
@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+class AddMergeRequestBlocks < ActiveRecord::Migration[5.0]
+  include Gitlab::Database::MigrationHelpers
+
+  DOWNTIME = false
+
+  def change
+    create_table :merge_request_blocks, id: :bigserial do |t|
+      t.references :blocking_merge_request,
+                   index: false, null: false,
+                   foreign_key: { to_table: :merge_requests, on_delete: :cascade }
+
+      t.references :blocked_merge_request,
+                   index: true, null: false,
+                   foreign_key: { to_table: :merge_requests, on_delete: :cascade }
+
+      t.index [:blocking_merge_request_id, :blocked_merge_request_id],
+              unique: true,
+              name: 'index_mr_blocks_on_blocking_and_blocked_mr_ids'
+
+      t.timestamps_with_timezone
+    end
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index de9e6f0b40d..501cb96d479 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -1223,6 +1223,15 @@ ActiveRecord::Schema.define(version: 20190426180107) do
     t.index ["user_id"], name: "index_merge_request_assignees_on_user_id", using: :btree
   end
 
+  create_table "merge_request_blocks", force: :cascade do |t|
+    t.integer "blocking_merge_request_id", null: false
+    t.integer "blocked_merge_request_id", null: false
+    t.datetime_with_timezone "created_at", null: false
+    t.datetime_with_timezone "updated_at", null: false
+    t.index ["blocked_merge_request_id"], name: "index_merge_request_blocks_on_blocked_merge_request_id", using: :btree
+    t.index ["blocking_merge_request_id", "blocked_merge_request_id"], name: "index_mr_blocks_on_blocking_and_blocked_mr_ids", unique: true, using: :btree
+  end
+
   create_table "merge_request_diff_commits", id: false, force: :cascade do |t|
     t.datetime_with_timezone "authored_date"
     t.datetime_with_timezone "committed_date"
@@ -2496,6 +2505,8 @@ ActiveRecord::Schema.define(version: 20190426180107) do
   add_foreign_key "members", "users", name: "fk_2e88fb7ce9", on_delete: :cascade
   add_foreign_key "merge_request_assignees", "merge_requests", on_delete: :cascade
   add_foreign_key "merge_request_assignees", "users", on_delete: :cascade
+  add_foreign_key "merge_request_blocks", "merge_requests", column: "blocked_merge_request_id", on_delete: :cascade
+  add_foreign_key "merge_request_blocks", "merge_requests", column: "blocking_merge_request_id", on_delete: :cascade
   add_foreign_key "merge_request_diff_commits", "merge_request_diffs", on_delete: :cascade
   add_foreign_key "merge_request_diff_files", "merge_request_diffs", on_delete: :cascade
   add_foreign_key "merge_request_diffs", "merge_requests", name: "fk_8483f3258f", on_delete: :cascade