diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-12-10 12:10:18 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-12-10 12:10:18 +0000 |
| commit | e838c62efb5d95fe76b5bbb6cba8b73c40eb2008 (patch) | |
| tree | 6950ae1392a4c596e0885e7f79a8b69d6b008afb /lib/gitlab/email | |
| parent | 240609275dbc67cfd6eab5d5a55ab632db41a9ac (diff) | |
| download | gitlab-ce-e838c62efb5d95fe76b5bbb6cba8b73c40eb2008.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab/email')
| -rw-r--r-- | lib/gitlab/email/hook/smime_signature_interceptor.rb | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/lib/gitlab/email/hook/smime_signature_interceptor.rb b/lib/gitlab/email/hook/smime_signature_interceptor.rb index 0b092b3e41e..ed1bf3e12bf 100644 --- a/lib/gitlab/email/hook/smime_signature_interceptor.rb +++ b/lib/gitlab/email/hook/smime_signature_interceptor.rb @@ -45,7 +45,6 @@ module Gitlab end def overwrite_headers(message, signed_email) - message.content_disposition = signed_email.content_disposition message.content_transfer_encoding = signed_email.content_transfer_encoding message.content_type = signed_email.content_type end |