diff options
| author | Phil Hughes <me@iamphill.com> | 2018-02-06 15:57:48 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2018-02-06 15:57:48 +0000 |
| commit | ba62493009c2360018709b660956a6173f3e1515 (patch) | |
| tree | 623ba15e0bb0a07f1483b38ca8e10ec41d702a14 /app/controllers | |
| parent | 805799b71b059b1bfb3578c4e78db3030ec04b6a (diff) | |
| parent | 0ecd759d73abaee5c08adbd8ab3db651c2522b14 (diff) | |
| download | gitlab-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 'app/controllers')
| -rw-r--r-- | app/controllers/projects/clusters/gcp_controller.rb | 2 | ||||
| -rw-r--r-- | app/controllers/projects/clusters_controller.rb | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/app/controllers/projects/clusters/gcp_controller.rb b/app/controllers/projects/clusters/gcp_controller.rb index 4fc515bd03e..94d33b91562 100644 --- a/app/controllers/projects/clusters/gcp_controller.rb +++ b/app/controllers/projects/clusters/gcp_controller.rb @@ -42,7 +42,7 @@ class Projects::Clusters::GcpController < Projects::ApplicationController when 'true' return when 'false' - flash[:alert] = _('Please <a href=%{link_to_billing} target="_blank" rel="noopener noreferrer">enable billing for one of your projects to be able to create a cluster</a>, then try again.').html_safe % { link_to_billing: "https://console.cloud.google.com/freetrial?utm_campaign=2018_cpanel&utm_source=gitlab&utm_medium=referral" } + flash[:alert] = _('Please <a href=%{link_to_billing} target="_blank" rel="noopener noreferrer">enable billing for one of your projects to be able to create a Kubernetes cluster</a>, then try again.').html_safe % { link_to_billing: "https://console.cloud.google.com/freetrial?utm_campaign=2018_cpanel&utm_source=gitlab&utm_medium=referral" } else flash[:alert] = _('We could not verify that one of your projects on GCP has billing enabled. Please try again.') end diff --git a/app/controllers/projects/clusters_controller.rb b/app/controllers/projects/clusters_controller.rb index 1dc7f1b3a7f..142e8b6e4bc 100644 --- a/app/controllers/projects/clusters_controller.rb +++ b/app/controllers/projects/clusters_controller.rb @@ -41,7 +41,7 @@ class Projects::ClustersController < Projects::ApplicationController head :no_content end format.html do - flash[:notice] = "Cluster was successfully updated." + flash[:notice] = _('Kubernetes cluster was successfully updated.') redirect_to project_cluster_path(project, cluster) end end @@ -55,10 +55,10 @@ class Projects::ClustersController < Projects::ApplicationController def destroy if cluster.destroy - flash[:notice] = "Cluster integration was successfully removed." + flash[:notice] = _('Kubernetes cluster integration was successfully removed.') redirect_to project_clusters_path(project), status: 302 else - flash[:notice] = "Cluster integration was not removed." + flash[:notice] = _('Kubernetes cluster integration was not removed.') render :show end end |