diff options
author | Tiger <twatson@gitlab.com> | 2019-06-21 04:43:52 +0300 |
---|---|---|
committer | Tiger <twatson@gitlab.com> | 2019-06-21 04:53:32 +0300 |
commit | d5a0ee924a6c85c75d5394567de41ed1425926f4 (patch) | |
tree | b89b817f8df53c87d54648b0ddc32645791a87ec /app | |
parent | da5c00d1c669c1aa4ebc714cfc357fc73f3e1331 (diff) |
Update KubernetesService deprecation warning
Diffstat (limited to 'app')
-rw-r--r-- | app/models/project_services/kubernetes_service.rb | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/app/models/project_services/kubernetes_service.rb b/app/models/project_services/kubernetes_service.rb index edf7e886e77..27b7827d55e 100644 --- a/app/models/project_services/kubernetes_service.rb +++ b/app/models/project_services/kubernetes_service.rb @@ -170,12 +170,11 @@ class KubernetesService < Service def deprecation_message content = if project - _("Kubernetes service integration has been deprecated. %{deprecated_message_content} your Kubernetes clusters using the new <a href=\"%{url}\"/>Kubernetes Clusters</a> page") % { - deprecated_message_content: deprecated_message_content, + _("Kubernetes service integration has been disabled. Fields on this page are not used by GitLab, you can configure your Kubernetes clusters using the new <a href=\"%{url}\"/>Kubernetes Clusters</a> page") % { url: Gitlab::Routing.url_helpers.project_clusters_path(project) } else - _("The instance-level Kubernetes service integration is deprecated. Your data has been migrated to an <a href=\"%{url}\"/>instance-level cluster</a>.") % { + _("The instance-level Kubernetes service integration is disabled. Your data has been migrated to an <a href=\"%{url}\"/>instance-level cluster</a>.") % { url: Gitlab::Routing.url_helpers.admin_clusters_path } end @@ -260,8 +259,4 @@ class KubernetesService < Service errors[:base] << deprecation_message end end - - def deprecated_message_content - _("Fields on this page are now uneditable, you can configure") - end end |