diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-03 15:06:00 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-03 15:06:00 +0300 |
| commit | 927cfbfe63dd3dc64df9d341d7c4328a2fe3597f (patch) | |
| tree | caa1dc128491ed9dbfdcd40737db429f4b066707 /config | |
| parent | 2b67531b0fd7c94cb1d8618166c4193f40ea5a1f (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config')
| -rw-r--r-- | config/initializers/google_api_client.rb | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/config/initializers/google_api_client.rb b/config/initializers/google_api_client.rb index 71338d2d9e1..443bb29fb52 100644 --- a/config/initializers/google_api_client.rb +++ b/config/initializers/google_api_client.rb @@ -10,6 +10,12 @@ # require 'google/apis/container_v1beta1' +require 'google/apis/options' + +# As stated in https://github.com/googleapis/google-api-ruby-client#errors--retries, +# enabling retries is strongly encouraged but disabled by default. Large uploads +# that may hit timeouts will mainly benefit from this. +Google::Apis::RequestOptions.default.retries = 3 if Gitlab::Utils.to_boolean(ENV.fetch('ENABLE_GOOGLE_API_RETRIES', true)) Google::Apis::ContainerV1beta1::AddonsConfig::Representation.tap do |representation| representation.hash :cloud_run_config, as: 'cloudRunConfig' |