Add latest changes from gitlab-org/gitlab@master

4 files changed, 62 insertions, 0 deletions

diff --git a/db/migrate/20191206014412_add_image_to_design_management_designs_versions.rb b/db/migrate/20191206014412_add_image_to_design_management_designs_versions.rb
new file mode 100644
index 00000000000..d8e2269d21a
--- /dev/null
+++ b/db/migrate/20191206014412_add_image_to_design_management_designs_versions.rb
@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+class AddImageToDesignManagementDesignsVersions < ActiveRecord::Migration[6.0]
+  DOWNTIME = false
+
+  def change
+    add_column :design_management_designs_versions, :image_v432x230, :string, limit: 255
+  end
+end
diff --git a/db/migrate/20200203015140_add_id_to_design_management_designs_versions.rb b/db/migrate/20200203015140_add_id_to_design_management_designs_versions.rb
new file mode 100644
index 00000000000..f809bc84fae
--- /dev/null
+++ b/db/migrate/20200203015140_add_id_to_design_management_designs_versions.rb
@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+class AddIdToDesignManagementDesignsVersions < ActiveRecord::Migration[6.0]
+  DOWNTIME = false
+
+  def change
+    add_column :design_management_designs_versions, :id, :primary_key
+  end
+end
diff --git a/db/migrate/20200215222507_drop_forked_project_links_fk.rb b/db/migrate/20200215222507_drop_forked_project_links_fk.rb
new file mode 100644
index 00000000000..f3ee36e9037
--- /dev/null
+++ b/db/migrate/20200215222507_drop_forked_project_links_fk.rb
@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+class DropForkedProjectLinksFk < ActiveRecord::Migration[6.0]
+  include Gitlab::Database::MigrationHelpers
+
+  DOWNTIME = false
+
+  disable_ddl_transaction!
+
+  def up
+    with_lock_retries do
+      remove_foreign_key_if_exists :forked_project_links, column: :forked_to_project_id
+    end
+  end
+
+  def down
+    unless foreign_key_exists?(:forked_project_links, :projects, column: :forked_to_project_id)
+      with_lock_retries do
+        # rubocop: disable Migration/AddConcurrentForeignKey
+        add_foreign_key :forked_project_links, :projects, column: :forked_to_project_id, on_delete: :cascade, validate: false
+      end
+    end
+
+    fk_name = concurrent_foreign_key_name(:forked_project_links, :forked_to_project_id, prefix: 'fk_rails_')
+    validate_foreign_key(:forked_project_links, :forked_to_project_id, name: fk_name)
+  end
+end
diff --git a/db/migrate/20200215225103_drop_forked_project_links_table.rb b/db/migrate/20200215225103_drop_forked_project_links_table.rb
new file mode 100644
index 00000000000..f8dbd19980e
--- /dev/null
+++ b/db/migrate/20200215225103_drop_forked_project_links_table.rb
@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+class DropForkedProjectLinksTable < ActiveRecord::Migration[6.0]
+  include Gitlab::Database::MigrationHelpers
+
+  DOWNTIME = false
+
+  def change
+    drop_table "forked_project_links", id: :serial do |t|
+      t.integer "forked_to_project_id", null: false
+      t.integer "forked_from_project_id", null: false
+      t.datetime "created_at"
+      t.datetime "updated_at"
+      t.index ["forked_to_project_id"], name: "index_forked_project_links_on_forked_to_project_id", unique: true
+    end
+  end
+end