Merge branch '56959-drop-project_auto_devops_domain' into 'master'

Removes project_auto_devops#domain column

Closes #56959

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

6 files changed, 21 insertions, 5 deletions

diff --git a/app/models/project_auto_devops.rb b/app/models/project_auto_devops.rb
index 90bcb3067f6..67c12363a3c 100644
--- a/app/models/project_auto_devops.rb
+++ b/app/models/project_auto_devops.rb
@@ -1,6 +1,10 @@
 # frozen_string_literal: true
 
 class ProjectAutoDevops < ApplicationRecord
+  include IgnorableColumn
+
+  ignore_column :domain
+
   belongs_to :project
 
   enum deploy_strategy: {
@@ -12,8 +16,6 @@ class ProjectAutoDevops < ApplicationRecord
   scope :enabled, -> { where(enabled: true) }
   scope :disabled, -> { where(enabled: false) }
 
-  validates :domain, allow_blank: true, hostname: { allow_numeric_hostname: true }
-
   after_save :create_gitlab_deploy_token, if: :needs_to_create_deploy_token?
 
   def predefined_variables
diff --git a/changelogs/unreleased/56959-drop-project_auto_devops_domain.yml b/changelogs/unreleased/56959-drop-project_auto_devops_domain.yml
new file mode 100644
index 00000000000..c529749670d
--- /dev/null
+++ b/changelogs/unreleased/56959-drop-project_auto_devops_domain.yml
@@ -0,0 +1,5 @@
+---
+title: Removes project_auto_devops#domain column
+merge_request: 28574
+author:
+type: other
diff --git a/db/post_migrate/20190522143720_drop_project_auto_devops_domain.rb b/db/post_migrate/20190522143720_drop_project_auto_devops_domain.rb
new file mode 100644
index 00000000000..36278d83927
--- /dev/null
+++ b/db/post_migrate/20190522143720_drop_project_auto_devops_domain.rb
@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+class DropProjectAutoDevopsDomain < ActiveRecord::Migration[5.1]
+  include Gitlab::Database::MigrationHelpers
+
+  DOWNTIME = false
+
+  def change
+    remove_column :project_auto_devops, :domain, :string
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 39d9743bcc9..378cb9c65d0 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -1633,7 +1633,6 @@ ActiveRecord::Schema.define(version: 20190527194900) do
     t.datetime_with_timezone "created_at", null: false
     t.datetime_with_timezone "updated_at", null: false
     t.boolean "enabled"
-    t.string "domain"
     t.integer "deploy_strategy", default: 0, null: false
     t.index ["project_id"], name: "index_project_auto_devops_on_project_id", unique: true, using: :btree
   end
diff --git a/spec/controllers/projects/settings/ci_cd_controller_spec.rb b/spec/controllers/projects/settings/ci_cd_controller_spec.rb
index db53e5bc8a4..b91a4df40a5 100644
--- a/spec/controllers/projects/settings/ci_cd_controller_spec.rb
+++ b/spec/controllers/projects/settings/ci_cd_controller_spec.rb
@@ -109,7 +109,7 @@ describe Projects::Settings::CiCdController do
     end
 
     context 'when updating the auto_devops settings' do
-      let(:params) { { auto_devops_attributes: { enabled: '', domain: 'mepmep.md' } } }
+      let(:params) { { auto_devops_attributes: { enabled: '' } } }
 
       context 'following the instance default' do
         let(:params) { { auto_devops_attributes: { enabled: '' } } }
diff --git a/spec/factories/project_auto_devops.rb b/spec/factories/project_auto_devops.rb
index 75ac7cc7687..1de42512402 100644
--- a/spec/factories/project_auto_devops.rb
+++ b/spec/factories/project_auto_devops.rb
@@ -2,7 +2,6 @@ FactoryBot.define do
   factory :project_auto_devops do
     project
     enabled true
-    domain "example.com"
     deploy_strategy :continuous
 
     trait :continuous_deployment do