diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-09-23 00:06:29 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-09-23 00:06:29 +0000 |
| commit | 98dbb0a488d7b0093f352938210d9578b0f7a8a6 (patch) | |
| tree | 25654204f8de2672556a696199fa209b8f8ff1b3 /config | |
| parent | 9ce26d3dfdf4194f32c470cd3102b4376a53ef2f (diff) | |
| download | gitlab-ce-98dbb0a488d7b0093f352938210d9578b0f7a8a6.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config')
| -rw-r--r-- | config/initializers/google_api_client.rb | 17 | ||||
| -rw-r--r-- | config/sidekiq_queues.yml | 1 |
2 files changed, 18 insertions, 0 deletions
diff --git a/config/initializers/google_api_client.rb b/config/initializers/google_api_client.rb new file mode 100644 index 00000000000..611726a20c7 --- /dev/null +++ b/config/initializers/google_api_client.rb @@ -0,0 +1,17 @@ +# frozen_string_literal: true +# +# google-api-client >= 0.26.0 supports enabling CloudRun and Istio during +# cluster creation, but fog-google currently hard deps on '~> 0.23.0', which +# prevents us from upgrading. We are injecting these options as hashes below +# as a workaround until this is resolved. +# +# This can be removed once fog-google and google-api-client can be upgraded. +# See https://gitlab.com/gitlab-org/gitlab-ce/issues/66630 for more details. +# + +require 'google/apis/container_v1beta1' + +Google::Apis::ContainerV1beta1::AddonsConfig::Representation.tap do |representation| + representation.hash :cloud_run_config, as: 'cloudRunConfig' + representation.hash :istio_config, as: 'istioConfig' +end diff --git a/config/sidekiq_queues.yml b/config/sidekiq_queues.yml index f37cd518d48..6b0741667bd 100644 --- a/config/sidekiq_queues.yml +++ b/config/sidekiq_queues.yml @@ -117,3 +117,4 @@ - [jira_connect, 1] - [update_external_pull_requests, 3] - [refresh_license_compliance_checks, 2] + - [design_management_new_version, 1] |