Add latest changes from gitlab-org/gitlab@master

2 files changed, 14 insertions, 0 deletions

diff --git a/db/migrate/20191204192726_add_design_disk_path_to_geo_hashed_storage_migrated_events.rb b/db/migrate/20191204192726_add_design_disk_path_to_geo_hashed_storage_migrated_events.rb
new file mode 100644
index 00000000000..39b5d5c7e97
--- /dev/null
+++ b/db/migrate/20191204192726_add_design_disk_path_to_geo_hashed_storage_migrated_events.rb
@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+class AddDesignDiskPathToGeoHashedStorageMigratedEvents < ActiveRecord::Migration[5.2]
+  include Gitlab::Database::MigrationHelpers
+
+  DOWNTIME = false
+
+  def change
+    add_column :geo_hashed_storage_migrated_events, :old_design_disk_path, :text
+    add_column :geo_hashed_storage_migrated_events, :new_design_disk_path, :text
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 4f94c0accfa..42420e653aa 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -1663,6 +1663,8 @@ ActiveRecord::Schema.define(version: 2019_12_06_122926) do
     t.text "new_wiki_disk_path", null: false
     t.integer "old_storage_version", limit: 2
     t.integer "new_storage_version", limit: 2, null: false
+    t.text "old_design_disk_path"
+    t.text "new_design_disk_path"
     t.index ["project_id"], name: "index_geo_hashed_storage_migrated_events_on_project_id"
   end