Add latest changes from gitlab-org/gitlab@13-0-stable-ee

1 files changed, 20 insertions, 0 deletions

diff --git a/db/migrate/20200304023851_add_sprint_to_merge_requests.rb b/db/migrate/20200304023851_add_sprint_to_merge_requests.rb
new file mode 100644
index 00000000000..e294abe66cd
--- /dev/null
+++ b/db/migrate/20200304023851_add_sprint_to_merge_requests.rb
@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+class AddSprintToMergeRequests < ActiveRecord::Migration[6.0]
+  include Gitlab::Database::MigrationHelpers
+
+  DOWNTIME = false
+
+  def up
+    with_lock_retries do
+      # index will be added in another migration with `add_concurrent_index`
+      add_column :merge_requests, :sprint_id, :bigint
+    end
+  end
+
+  def down
+    with_lock_retries do
+      remove_column :merge_requests, :sprint_id
+    end
+  end
+end