Merge branch '52363-ui-changes-to-cluster-and-ado-pages' into 'master'

Moves domain setting to Clusters page

Closes #52363

See merge request gitlab-org/gitlab-ce!24580

2 files changed, 50 insertions, 1 deletions

diff --git a/db/post_migrate/20190204115450_migrate_auto_dev_ops_domain_to_cluster_domain.rb b/db/post_migrate/20190204115450_migrate_auto_dev_ops_domain_to_cluster_domain.rb
new file mode 100644
index 00000000000..392e64eeade
--- /dev/null
+++ b/db/post_migrate/20190204115450_migrate_auto_dev_ops_domain_to_cluster_domain.rb
@@ -0,0 +1,49 @@
+# frozen_string_literal: true
+
+class MigrateAutoDevOpsDomainToClusterDomain < ActiveRecord::Migration[5.0]
+  include Gitlab::Database::MigrationHelpers
+
+  DOWNTIME = false
+
+  def up
+    execute(update_clusters_domain_query)
+  end
+
+  def down
+    # no-op
+  end
+
+  private
+
+  def update_clusters_domain_query
+    if Gitlab::Database.mysql?
+      mysql_query
+    else
+      postgresql_query
+    end
+  end
+
+  def mysql_query
+    <<~HEREDOC
+    UPDATE clusters, project_auto_devops, cluster_projects
+    SET
+      clusters.domain = project_auto_devops.domain
+    WHERE
+      cluster_projects.cluster_id = clusters.id
+      AND project_auto_devops.project_id = cluster_projects.project_id
+      AND project_auto_devops.domain != ''
+    HEREDOC
+  end
+
+  def postgresql_query
+    <<~HEREDOC
+    UPDATE clusters
+    SET domain = project_auto_devops.domain
+    FROM cluster_projects, project_auto_devops
+    WHERE
+      cluster_projects.cluster_id = clusters.id
+      AND project_auto_devops.project_id = cluster_projects.project_id
+      AND project_auto_devops.domain != ''
+    HEREDOC
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 97ce8d21645..c0026170edc 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: 20190131122559) do
+ActiveRecord::Schema.define(version: 20190204115450) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"