Commit aa377cbd authored by Peter Leitzen's avatar Peter Leitzen

Merge branch 'rename_vulnerability_methods_in_issue_controller' into 'master'

Rename methods to specify vulnerability relation

See merge request gitlab-org/gitlab!51622
parents 9e9a0ccc 41b17ec2
...@@ -43,7 +43,7 @@ module EE ...@@ -43,7 +43,7 @@ module EE
def issue_params def issue_params
super.tap do |params| super.tap do |params|
if vulnerability_id if vulnerability_id
params.merge!(issue_build_parameters) params.merge!(vulnerability_issue_build_parameters)
end end
end end
end end
...@@ -65,15 +65,15 @@ module EE ...@@ -65,15 +65,15 @@ module EE
project.vulnerabilities.find(vulnerability_id) if vulnerability_id project.vulnerabilities.find(vulnerability_id) if vulnerability_id
end end
def issue_build_parameters def vulnerability_issue_build_parameters
{ {
title: _("Investigate vulnerability: %{title}") % { title: vulnerability.title }, title: _("Investigate vulnerability: %{title}") % { title: vulnerability.title },
description: render_description, description: render_vulnerability_description,
confidential: true confidential: true
} }
end end
def render_description def render_vulnerability_description
render_to_string( render_to_string(
template: 'vulnerabilities/issue_description.md.erb', template: 'vulnerabilities/issue_description.md.erb',
locals: { vulnerability: vulnerability.present } locals: { vulnerability: vulnerability.present }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment