diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2018-01-11 11:27:19 +0000 |
|---|---|---|
| committer | Kamil Trzciński <ayufan@ayufan.eu> | 2018-01-11 11:27:19 +0000 |
| commit | 59adc07f00f4f3ea326194d77c31580edfdfb2a4 (patch) | |
| tree | d6411d883c339a1b9fe7fd5c6e0949d319114842 /app/services | |
| parent | e55899ff4217cf2281c7fff762a5aca0cb89bcb7 (diff) | |
| parent | cf8429867021f20e671c02115b9c6806acd2d739 (diff) | |
| download | gitlab-ce-59adc07f00f4f3ea326194d77c31580edfdfb2a4.tar.gz | |
Merge branch 'gcp-fix' into 'master'
Fix GCP redirect
Closes #41867
See merge request gitlab-org/gitlab-ce!16355
Diffstat (limited to 'app/services')
| -rw-r--r-- | app/services/check_gcp_project_billing_service.rb | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/app/services/check_gcp_project_billing_service.rb b/app/services/check_gcp_project_billing_service.rb index 854adf2177d..ea82b61b279 100644 --- a/app/services/check_gcp_project_billing_service.rb +++ b/app/services/check_gcp_project_billing_service.rb @@ -2,7 +2,10 @@ class CheckGcpProjectBillingService def execute(token) client = GoogleApi::CloudPlatform::Client.new(token, nil) client.projects_list.select do |project| - client.projects_get_billing_info(project.name).billingEnabled + begin + client.projects_get_billing_info(project.project_id).billing_enabled + rescue + end end end end |