summaryrefslogtreecommitdiff
path: root/spec/models
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2018-02-06 15:57:48 +0000
committerPhil Hughes <me@iamphill.com>2018-02-06 15:57:48 +0000
commitba62493009c2360018709b660956a6173f3e1515 (patch)
tree623ba15e0bb0a07f1483b38ca8e10ec41d702a14 /spec/models
parent805799b71b059b1bfb3578c4e78db3030ec04b6a (diff)
parent0ecd759d73abaee5c08adbd8ab3db651c2522b14 (diff)
downloadgitlab-ce-ba62493009c2360018709b660956a6173f3e1515.tar.gz
Merge branch 'winh-kubernetes-clusters' into 'master'
Replace "cluster" with "Kubernetes cluster" Closes #41963 See merge request gitlab-org/gitlab-ce!16778
Diffstat (limited to 'spec/models')
-rw-r--r--spec/models/project_services/kubernetes_service_spec.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/models/project_services/kubernetes_service_spec.rb b/spec/models/project_services/kubernetes_service_spec.rb
index 6980ba335b8..622d8844a72 100644
--- a/spec/models/project_services/kubernetes_service_spec.rb
+++ b/spec/models/project_services/kubernetes_service_spec.rb
@@ -408,7 +408,7 @@ describe KubernetesService, :use_clean_rails_memory_store_caching do
context 'if the services is active' do
it 'should return a message' do
- expect(kubernetes_service.deprecation_message).to match(/Your cluster information on this page is still editable/)
+ expect(kubernetes_service.deprecation_message).to match(/Your Kubernetes cluster information on this page is still editable/)
end
end