diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2018-02-23 16:26:48 +0000 |
|---|---|---|
| committer | Kamil Trzciński <ayufan@ayufan.eu> | 2018-02-23 16:26:48 +0000 |
| commit | 92ac835a7f0799cb53974c4bac43b9811a736849 (patch) | |
| tree | 3f544f891a346efef776e16ce00ef88c43af62b0 /app/controllers/projects/clusters/gcp_controller.rb | |
| parent | 8c310424ca2e31ee84d2a404bc42c2e310fb722f (diff) | |
| parent | 99cd4acf0eb1bab536c13759fd741cd5a3e1dd02 (diff) | |
| download | gitlab-ce-92ac835a7f0799cb53974c4bac43b9811a736849.tar.gz | |
Merge branch '43496-error-message-for-gke-clusters-persists-in-the-next-page' into 'master'bjk/kube_state_metrics
Resolve "Error message for GKE clusters persists in the next page"
Closes #43496
See merge request gitlab-org/gitlab-ce!17299
Diffstat (limited to 'app/controllers/projects/clusters/gcp_controller.rb')
| -rw-r--r-- | app/controllers/projects/clusters/gcp_controller.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/projects/clusters/gcp_controller.rb b/app/controllers/projects/clusters/gcp_controller.rb index 0f41af7d87b..6b0b22f8e73 100644 --- a/app/controllers/projects/clusters/gcp_controller.rb +++ b/app/controllers/projects/clusters/gcp_controller.rb @@ -40,9 +40,9 @@ class Projects::Clusters::GcpController < Projects::ApplicationController def verify_billing case google_project_billing_status when nil - flash[:alert] = _('We could not verify that one of your projects on GCP has billing enabled. Please try again.') + flash.now[:alert] = _('We could not verify that one of your projects on GCP has billing enabled. Please try again.') 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 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" } + flash.now[: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" } when true return end |