Skip to content
代码片段 群组 项目
提交 2da743f6 编辑于 作者: Peter Leitzen's avatar Peter Leitzen
浏览文件

Merge branch 'issue_342492_6' into 'master'

Pass formats explicitly when rendering .md.erb

See merge request gitlab-org/gitlab!73419
No related branches found
No related tags found
无相关合并请求
...@@ -97,14 +97,15 @@ def vulnerability_issue_feedback_params(issue, vulnerability) ...@@ -97,14 +97,15 @@ def vulnerability_issue_feedback_params(issue, vulnerability)
def render_vulnerability_description def render_vulnerability_description
render_to_string( render_to_string(
template: 'vulnerabilities/issue_description.md.erb', template: 'vulnerabilities/issue_description',
formats: :md,
locals: { vulnerability: vulnerability.present } locals: { vulnerability: vulnerability.present }
) )
end end
def render_vulnerability_link_alert(error_message) def render_vulnerability_link_alert(error_message)
render_to_string( render_to_string(
partial: 'vulnerabilities/unable_to_link_vulnerability.html.haml', partial: 'vulnerabilities/unable_to_link_vulnerability',
locals: { locals: {
vulnerability_link: vulnerability_path(vulnerability), vulnerability_link: vulnerability_path(vulnerability),
error_message: error_message error_message: error_message
......
0% 加载中 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册