Add latest changes from gitlab-org/gitlab@master

6 files changed, 92 insertions, 10 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
diff --git a/db/post_migrate/20200214214934_create_environment_for_self_monitoring_project.rb b/db/post_migrate/20200214214934_create_environment_for_self_monitoring_project.rb
new file mode 100644
index 00000000000..a44efa3c460
--- /dev/null
+++ b/db/post_migrate/20200214214934_create_environment_for_self_monitoring_project.rb
@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+class CreateEnvironmentForSelfMonitoringProject < ActiveRecord::Migration[6.0]
+  DOWNTIME = false
+
+  def up
+    execute <<~SQL
+      INSERT INTO environments (project_id, name, slug, created_at, updated_at)
+      SELECT instance_administration_project_id, 'production', 'production', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP
+      FROM application_settings
+      WHERE instance_administration_project_id IS NOT NULL
+      AND NOT EXISTS (
+        SELECT 1
+        FROM environments
+        INNER JOIN application_settings
+        ON application_settings.instance_administration_project_id = environments.project_id
+      )
+    SQL
+  end
+
+  def down
+    # no-op
+
+    # This migration cannot be reversed because it cannot be ensured that the environment for the Self Monitoring Project
+    # did not already exist before the migration ran - in that case, the migration does nothing, and it would be unexpected
+    # behavior for that environment to be deleted by reversing this migration.
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 0b3eab9797e..2fe21469398 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -1417,10 +1417,11 @@ ActiveRecord::Schema.define(version: 2020_02_20_180944) do
     t.index ["project_id"], name: "index_design_management_designs_on_project_id"
   end
 
-  create_table "design_management_designs_versions", id: false, force: :cascade do |t|
+  create_table "design_management_designs_versions", force: :cascade do |t|
     t.bigint "design_id", null: false
     t.bigint "version_id", null: false
     t.integer "event", limit: 2, default: 0, null: false
+    t.string "image_v432x230", limit: 255
     t.index ["design_id", "version_id"], name: "design_management_designs_versions_uniqueness", unique: true
     t.index ["design_id"], name: "index_design_management_designs_versions_on_design_id"
     t.index ["event"], name: "index_design_management_designs_versions_on_event"
@@ -1654,14 +1655,6 @@ ActiveRecord::Schema.define(version: 2020_02_20_180944) do
     t.index ["root_project_id"], name: "index_fork_networks_on_root_project_id", unique: true
   end
 
-  create_table "forked_project_links", id: :serial, force: :cascade 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
-
   create_table "geo_cache_invalidation_events", force: :cascade do |t|
     t.string "key", null: false
   end
@@ -4747,7 +4740,6 @@ ActiveRecord::Schema.define(version: 2020_02_20_180944) do
   add_foreign_key "fork_network_members", "projects", column: "forked_from_project_id", name: "fk_b01280dae4", on_delete: :nullify
   add_foreign_key "fork_network_members", "projects", on_delete: :cascade
   add_foreign_key "fork_networks", "projects", column: "root_project_id", name: "fk_e7b436b2b5", on_delete: :nullify
-  add_foreign_key "forked_project_links", "projects", column: "forked_to_project_id", name: "fk_434510edb0", on_delete: :cascade
   add_foreign_key "geo_container_repository_updated_events", "container_repositories", name: "fk_212c89c706", on_delete: :cascade
   add_foreign_key "geo_event_log", "geo_cache_invalidation_events", column: "cache_invalidation_event_id", name: "fk_42c3b54bed", on_delete: :cascade
   add_foreign_key "geo_event_log", "geo_container_repository_updated_events", column: "container_repository_updated_event_id", name: "fk_6ada82d42a", on_delete: :cascade