diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-05-25 20:30:46 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-05-25 20:30:46 +0000 |
| commit | 1d287b31040662f1cc53a61b866ea97931a6b850 (patch) | |
| tree | 64c1ff71f40695c1d516a7b24cabf06c408685f1 /lib/gitlab/email/attachment_uploader.rb | |
| parent | fdcb3d47df0526a9dc437c847683df8aae1e5d58 (diff) | |
| download | gitlab-ce-1d287b31040662f1cc53a61b866ea97931a6b850.tar.gz | |
Add latest changes from gitlab-org/gitlab@13-12-stable-ee
Diffstat (limited to 'lib/gitlab/email/attachment_uploader.rb')
| -rw-r--r-- | lib/gitlab/email/attachment_uploader.rb | 2 |
1 files changed, 1 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) } |