Add latest changes from gitlab-org/gitlab@13-5-stable-eev13.5.0-rc42

1 files changed, 19 insertions, 0 deletions

diff --git a/db/migrate/20200925193906_add_namespace_foreign_key_to_bulk_import_entities.rb b/db/migrate/20200925193906_add_namespace_foreign_key_to_bulk_import_entities.rb
new file mode 100644
index 00000000000..13212395488
--- /dev/null
+++ b/db/migrate/20200925193906_add_namespace_foreign_key_to_bulk_import_entities.rb
@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+class AddNamespaceForeignKeyToBulkImportEntities < ActiveRecord::Migration[6.0]
+  include Gitlab::Database::MigrationHelpers
+
+  DOWNTIME = false
+
+  disable_ddl_transaction!
+
+  def up
+    add_concurrent_foreign_key :bulk_import_entities, :namespaces, column: :namespace_id
+  end
+
+  def down
+    with_lock_retries do
+      remove_foreign_key :bulk_import_entities, column: :namespace_id
+    end
+  end
+end