diff options
author | Mayra Cabrera <mcabrera@gitlab.com> | 2019-02-07 20:11:17 +0300 |
---|---|---|
committer | Mayra Cabrera <mcabrera@gitlab.com> | 2019-02-07 20:11:22 +0300 |
commit | b3364566c403b1e7027b1e19d619f5b2f614fcf2 (patch) | |
tree | 4a40a71adf280c84916af82efefa30110268195c /app | |
parent | e0ef2376874ef165a3ca4405cf9cfac241302d3f (diff) |
Fixes technical debt issues for cluster domain
- Avoid using direct code on spec migration
- Removes milestone and point to issue, to avoid making fake promises
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/57397
Diffstat (limited to 'app')
-rw-r--r-- | app/models/clusters/cluster.rb | 3 | ||||
-rw-r--r-- | app/models/project_auto_devops.rb | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/app/models/clusters/cluster.rb b/app/models/clusters/cluster.rb index f2f5b89e3bb..7025fc2cc02 100644 --- a/app/models/clusters/cluster.rb +++ b/app/models/clusters/cluster.rb @@ -221,7 +221,8 @@ module Clusters # ProjectAutoDevops#Domain, project variables or group variables, # as the AUTO_DEVOPS_DOMAIN is needed for CI_ENVIRONMENT_URL # - # This method should be removed on 12.0 + # This method should is scheduled to be removed on + # https://gitlab.com/gitlab-org/gitlab-ce/issues/56959 def legacy_auto_devops_domain if project_type? project&.auto_devops&.domain.presence || diff --git a/app/models/project_auto_devops.rb b/app/models/project_auto_devops.rb index b6c5c7c4c87..e353a6443c4 100644 --- a/app/models/project_auto_devops.rb +++ b/app/models/project_auto_devops.rb @@ -27,7 +27,8 @@ class ProjectAutoDevops < ActiveRecord::Base # From 11.8, AUTO_DEVOPS_DOMAIN has been replaced by KUBE_INGRESS_BASE_DOMAIN. # See Clusters::Cluster#predefined_variables and https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/24580 # for more info. - # Support for AUTO_DEVOPS_DOMAIN support will be dropped on 12.0 on + # + # Suppport AUTO_DEVOPS_DOMAIN is scheduled to be removed on # https://gitlab.com/gitlab-org/gitlab-ce/issues/52363 def predefined_variables Gitlab::Ci::Variables::Collection.new.tap do |variables| |