diff options
author | Matija Čupić <matteeyah@gmail.com> | 2018-01-11 07:17:06 +0100 |
---|---|---|
committer | Matija Čupić <matteeyah@gmail.com> | 2018-01-11 07:17:06 +0100 |
commit | e6012d3eccb1586ba56a3adb23b7b1d568f2fd84 (patch) | |
tree | 955c2a57519bdc5fb11feaf9eb23ed4a9d5b13aa | |
parent | cf95756aacdce842a5a2375bdb56c75a1b6abba3 (diff) | |
download | gitlab-ce-e6012d3eccb1586ba56a3adb23b7b1d568f2fd84.tar.gz |
Change failed GCP billing check wording
-rw-r--r-- | app/controllers/projects/clusters/gcp_controller.rb | 2 | ||||
-rw-r--r-- | spec/features/projects/clusters/gcp_spec.rb | 2 |
2 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 51bd5e8cfce..4fc515bd03e 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>. Please 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 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/spec/features/projects/clusters/gcp_spec.rb b/spec/features/projects/clusters/gcp_spec.rb index 6457b10c356..8953b30bebf 100644 --- a/spec/features/projects/clusters/gcp_spec.rb +++ b/spec/features/projects/clusters/gcp_spec.rb @@ -147,7 +147,7 @@ feature 'Gcp Cluster', :js do end it 'user sees form with error' do - expect(page).to have_content('Please enable billing for one of your projects to be able to create a cluster. Please try again.') + expect(page).to have_content('Please enable billing for one of your projects to be able to create a cluster, then try again.') end end |