Add latest changes from gitlab-org/gitlab@master

2 files changed, 30 insertions, 1 deletions

diff --git a/db/migrate/20191125140458_create_import_failures.rb b/db/migrate/20191125140458_create_import_failures.rb
new file mode 100644
index 00000000000..43e8efe90a4
--- /dev/null
+++ b/db/migrate/20191125140458_create_import_failures.rb
@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+class CreateImportFailures < ActiveRecord::Migration[5.2]
+  DOWNTIME = false
+
+  def change
+    create_table :import_failures do |t|
+      t.integer :relation_index
+      t.references :project, null: false, index: true
+      t.datetime_with_timezone :created_at, null: false
+      t.string :relation_key, limit: 64
+      t.string :exception_class, limit: 128
+      t.string :correlation_id_value, limit: 128, index: true
+      t.string :exception_message, limit: 255
+    end
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 57d05abd980..782610b62f5 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 2019_11_24_150431) do
+ActiveRecord::Schema.define(version: 2019_11_25_140458) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "pg_trgm"
@@ -1948,6 +1948,18 @@ ActiveRecord::Schema.define(version: 2019_11_24_150431) do
     t.index ["updated_at"], name: "index_import_export_uploads_on_updated_at"
   end
 
+  create_table "import_failures", force: :cascade do |t|
+    t.integer "relation_index"
+    t.bigint "project_id", null: false
+    t.datetime_with_timezone "created_at", null: false
+    t.string "relation_key", limit: 64
+    t.string "exception_class", limit: 128
+    t.string "correlation_id_value", limit: 128
+    t.string "exception_message", limit: 255
+    t.index ["correlation_id_value"], name: "index_import_failures_on_correlation_id_value"
+    t.index ["project_id"], name: "index_import_failures_on_project_id"
+  end
+
   create_table "index_statuses", id: :serial, force: :cascade do |t|
     t.integer "project_id", null: false
     t.datetime "indexed_at"