Add latest changes from gitlab-org/gitlab@master

2 files changed, 22 insertions, 1 deletions

diff --git a/db/migrate/20200402124802_add_correlation_id_to_project_import_state.rb b/db/migrate/20200402124802_add_correlation_id_to_project_import_state.rb
new file mode 100644
index 00000000000..974009b101a
--- /dev/null
+++ b/db/migrate/20200402124802_add_correlation_id_to_project_import_state.rb
@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+class AddCorrelationIdToProjectImportState < ActiveRecord::Migration[6.0]
+  include Gitlab::Database::MigrationHelpers
+
+  DOWNTIME = false
+
+  def up
+    with_lock_retries do
+      add_column :project_mirror_data, :correlation_id_value, :string, limit: 128
+    end
+  end
+
+  def down
+    with_lock_retries do
+      remove_column :project_mirror_data, :correlation_id_value
+    end
+  end
+end
diff --git a/db/structure.sql b/db/structure.sql
index c2a2e4b361c..459d04570cc 100644
--- a/db/structure.sql
+++ b/db/structure.sql
@@ -4932,7 +4932,8 @@ CREATE TABLE public.project_mirror_data (
     jid character varying,
     last_error text,
     last_update_at timestamp with time zone,
-    last_successful_update_at timestamp with time zone
+    last_successful_update_at timestamp with time zone,
+    correlation_id_value character varying(128)
 );
 
 CREATE SEQUENCE public.project_mirror_data_id_seq
@@ -13062,6 +13063,7 @@ COPY "schema_migrations" (version) FROM STDIN;
 20200331220930
 20200401211005
 20200402123926
+20200402124802
 20200402135250
 20200402185044
 20200403184110