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

1 files changed, 21 insertions, 0 deletions

diff --git a/db/migrate/20210303193544_add_concurrent_fields_to_bulk_imports_trackers.rb b/db/migrate/20210303193544_add_concurrent_fields_to_bulk_imports_trackers.rb
new file mode 100644
index 00000000000..a2d3d6daf09
--- /dev/null
+++ b/db/migrate/20210303193544_add_concurrent_fields_to_bulk_imports_trackers.rb
@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+class AddConcurrentFieldsToBulkImportsTrackers < ActiveRecord::Migration[6.0]
+  DOWNTIME = false
+
+  # rubocop:disable Migration/AddLimitToTextColumns
+  # rubocop:disable Rails/NotNullColumn
+  def up
+    add_column :bulk_import_trackers, :jid, :text
+    add_column :bulk_import_trackers, :stage, :smallint, default: 0, null: false
+    add_column :bulk_import_trackers, :status, :smallint, default: 0, null: false
+  end
+  # rubocop:enable Migration/AddLimitToTextColumns
+  # rubocop:enable Rails/NotNullColumn
+
+  def down
+    remove_column :bulk_import_trackers, :jid, :text
+    remove_column :bulk_import_trackers, :stage, :smallint
+    remove_column :bulk_import_trackers, :status, :smallint
+  end
+end