diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-05-25 23:30:46 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-05-25 23:30:46 +0300 |
| commit | 1d287b31040662f1cc53a61b866ea97931a6b850 (patch) | |
| tree | 64c1ff71f40695c1d516a7b24cabf06c408685f1 /lib | |
| parent | fdcb3d47df0526a9dc437c847683df8aae1e5d58 (diff) | |
Add latest changes from gitlab-org/gitlab@13-12-stable-ee
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/email/attachment_uploader.rb | 2 | ||||
| -rw-r--r-- | lib/google_api/cloud_platform/client.rb | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/lib/gitlab/email/attachment_uploader.rb b/lib/gitlab/email/attachment_uploader.rb index 70e281fd4a3..e213adbfcfd 100644 --- a/lib/gitlab/email/attachment_uploader.rb +++ b/lib/gitlab/email/attachment_uploader.rb @@ -40,7 +40,7 @@ module Gitlab def filter_signature_attachments(message) attachments = message.attachments content_type = normalize_mime(message.content_type) - protocol = normalize_mime(message.content_type_parameters[:protocol]) + protocol = normalize_mime(message.content_type_parameters&.fetch(:protocol, nil)) if content_type == 'multipart/signed' && protocol attachments.delete_if { |attachment| protocol == normalize_mime(attachment.content_type) } diff --git a/lib/google_api/cloud_platform/client.rb b/lib/google_api/cloud_platform/client.rb index f16bd7c735b..34e3be2320b 100644 --- a/lib/google_api/cloud_platform/client.rb +++ b/lib/google_api/cloud_platform/client.rb @@ -13,6 +13,10 @@ module GoogleApi LEAST_TOKEN_LIFE_TIME = 10.minutes CLUSTER_MASTER_AUTH_USERNAME = 'admin' CLUSTER_IPV4_CIDR_BLOCK = '/16' + # Don't upgrade to > 1.18 before we move away from Basic Auth + # See issue: https://gitlab.com/gitlab-org/gitlab/-/issues/331582 + # Possible solution: https://gitlab.com/groups/gitlab-org/-/epics/6049 + GKE_VERSION = '1.18' CLUSTER_OAUTH_SCOPES = [ "https://www.googleapis.com/auth/devstorage.read_only", "https://www.googleapis.com/auth/logging.write", @@ -90,6 +94,7 @@ module GoogleApi cluster: { name: cluster_name, initial_node_count: cluster_size, + initial_cluster_version: GKE_VERSION, node_config: { machine_type: machine_type, oauth_scopes: CLUSTER_OAUTH_SCOPES |