diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-10-30 16:00:33 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-10-30 16:00:33 +0300 |
commit | e11efedcfcd80b2d55a1bdd17b317cef82ce0a0e (patch) | |
tree | dd176669205ad33e6b7e7e19068695af130e7a41 /app | |
parent | 5ba663860c0d90a17657b0cbb53ac582bf7edd43 (diff) |
Add latest changes from gitlab-org/security/gitlab@16-5-stable-ee
Diffstat (limited to 'app')
-rw-r--r-- | app/mailers/emails/service_desk.rb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/app/mailers/emails/service_desk.rb b/app/mailers/emails/service_desk.rb index 9f3611df2cc..f6595a91bee 100644 --- a/app/mailers/emails/service_desk.rb +++ b/app/mailers/emails/service_desk.rb @@ -211,7 +211,11 @@ module Emails end def issue_description - @issue.description_html.to_s + return '' if @issue.description_html.blank? + + # Remove references etc. from description HTML because external participants + # are no regular users and don't have permission to access them. + ::Banzai::Renderer.post_process(@issue.description_html, {}) end def subject_base |