diff options
| author | Robert Speicher <rspeicher@gmail.com> | 2019-05-31 21:17:30 +0300 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2019-05-31 21:17:30 +0300 |
| commit | 9209736a22501dd4ea16afee86d0968bead84100 (patch) | |
| tree | b2a6db95d89af260af1b2f4fd404137565bbfd23 /app/models | |
| parent | b9798c157ac5973e9dd2b7ad95267014034a219f (diff) | |
| parent | bfed231152fa476aa4be6e221d65dc5225d19537 (diff) | |
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
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/project_auto_devops.rb | 6 |
1 files changed, 4 insertions, 2 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 |