diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2018-01-10 15:44:15 +0100 |
|---|---|---|
| committer | Kamil Trzciński <ayufan@ayufan.eu> | 2018-01-10 15:44:15 +0100 |
| commit | 0cdd56e65816eaf7dd1ff78b0a3137152d366034 (patch) | |
| tree | f0e54ecbcf8b122c949117ee9ee787935a81b85b | |
| parent | cf6258af41cee0638665560509c87bb49135081d (diff) | |
| download | gitlab-ce-0cdd56e65816eaf7dd1ff78b0a3137152d366034.tar.gz | |
Fix link to billing
| -rw-r--r-- | app/controllers/projects/clusters/gcp_controller.rb | 3 | ||||
| -rw-r--r-- | app/workers/check_gcp_project_billing_worker.rb | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/app/controllers/projects/clusters/gcp_controller.rb b/app/controllers/projects/clusters/gcp_controller.rb index e0729c60670..44ccfaf2402 100644 --- a/app/controllers/projects/clusters/gcp_controller.rb +++ b/app/controllers/projects/clusters/gcp_controller.rb @@ -42,7 +42,8 @@ class Projects::Clusters::GcpController < Projects::ApplicationController when 'true' return when 'false' - flash[:alert] = _('Please enable billing for one of your projects to be able to create a cluster.') + flash[:alert] = _('Please <a href=%{link_to_billing}>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" } 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/workers/check_gcp_project_billing_worker.rb b/app/workers/check_gcp_project_billing_worker.rb index 6a0d8ab263f..5466ccdda59 100644 --- a/app/workers/check_gcp_project_billing_worker.rb +++ b/app/workers/check_gcp_project_billing_worker.rb @@ -4,7 +4,7 @@ class CheckGcpProjectBillingWorker include ApplicationWorker include ClusterQueue - LEASE_TIMEOUT = 15.seconds.to_i + LEASE_TIMEOUT = 3.seconds.to_i SESSION_KEY_TIMEOUT = 5.minutes BILLING_TIMEOUT = 1.hour |