diff options
author | GitLab Release Tools Bot <delivery-team+release-tools@gitlab.com> | 2023-10-31 16:46:39 +0300 |
---|---|---|
committer | GitLab Release Tools Bot <delivery-team+release-tools@gitlab.com> | 2023-10-31 16:46:39 +0300 |
commit | a1ebb4fc249f5fb89a27d508913534a2f343e96c (patch) | |
tree | 59493055751559be88fd9d831b4d05e87101f671 /app | |
parent | 5ba663860c0d90a17657b0cbb53ac582bf7edd43 (diff) | |
parent | d59d7a49a1fce89fab761783c6aa2d42447296b6 (diff) |
Merge remote-tracking branch 'dev/16-5-stable' into 16-5-stable
Diffstat (limited to 'app')
-rw-r--r-- | app/helpers/version_check_helper.rb | 4 | ||||
-rw-r--r-- | app/mailers/emails/service_desk.rb | 6 |
2 files changed, 8 insertions, 2 deletions
diff --git a/app/helpers/version_check_helper.rb b/app/helpers/version_check_helper.rb index 45a4b292eb5..895155e00d1 100644 --- a/app/helpers/version_check_helper.rb +++ b/app/helpers/version_check_helper.rb @@ -10,12 +10,14 @@ module VersionCheckHelper end def gitlab_version_check + return unless show_version_check? + VersionCheck.new.response end strong_memoize_attr :gitlab_version_check def show_security_patch_upgrade_alert? - return false unless show_version_check? && gitlab_version_check + return false unless gitlab_version_check Gitlab::Utils.to_boolean(gitlab_version_check['critical_vulnerability']) end 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 |