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

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|