Merge branch...

Merge branch '213573-resolution-diff-is-not-used-when-creating-issue-from-vulnerability' into 'master'

Attach diffs to Issue created from Vulnerability

See merge request gitlab-org/gitlab!32670

ee/app/views/vulnerabilities/issue_description.md.erb

-### Description:
+### <%= _("Description") %>:
 
 <%= vulnerability.description %>
 
 <% if vulnerability.severity.present? %>
-* Severity: <%= vulnerability.severity %>
+* <%= _("Severity") %>: <%= vulnerability.severity %>
 <% end %>
 <% if vulnerability.confidence.present? %>
-* Confidence: <%= vulnerability.confidence %>
+* <%= _("Confidence") %>: <%= vulnerability.confidence %>
 <% end %>
 <% if defined?(vulnerability.file) && vulnerability.file.present? %>
-* Location: [<%= vulnerability.location_text %>](<%= vulnerability.location_link %>)
+* <%= _("Location") %>: [<%= vulnerability.location_text %>](<%= vulnerability.location_link %>)
 <% end %>
 
 <% if vulnerability.solution.present? %>
-### Solution:
+### <%= _("Solution") %>:
 
 <%= vulnerability.solution %>
 <% end %>
 
 <% if vulnerability.identifiers.present? %>
-### Identifiers:
+### <%= _("Identifiers") %>:
 
 <% vulnerability.identifiers.each do |identifier| %>
 <% if identifier[:url].present? %>
@@ -31,7 +31,7 @@
 <% end %>
 
 <% if vulnerability.links.present? %>
-### Links:
+### <%= _("Links") %>:
 
 <% vulnerability.links.each do |link| %>
 <% if link[:name].present? %>
@@ -41,3 +41,18 @@
 <% end %>
 <% end %>
 <% end %>
+
+<% if vulnerability.remediations.present? %>
+### <%= _("Remediations") %>:
+
+<% vulnerability.remediations.each do |remediation| %>
+  <details>
+  <summary><%= _("Patch to apply") %></summary>
+
+  ```diff
+  <%= Base64.decode64(remediation[:diff]) %>
+  ```
+
+  </details>
+<% end %>
+<% end %>

locale/gitlab.pot

@@ -5709,6 +5709,9 @@ msgstr ""
 msgid "ComplianceFramework|This project is regulated by %{framework}."
 msgstr ""
 
+msgid "Confidence"
+msgstr ""
+
 msgid "Confidence: %{confidence}"
 msgstr ""
 
@@ -15487,6 +15490,9 @@ msgstr ""
 msgid "Paste your public SSH key, which is usually contained in the file '~/.ssh/id_ed25519.pub' or '~/.ssh/id_rsa.pub' and begins with 'ssh-ed25519' or 'ssh-rsa'. Don't use your private SSH key."
 msgstr ""
 
+msgid "Patch to apply"
+msgstr ""
+
 msgid "Path"
 msgstr ""
 
@@ -17933,6 +17939,9 @@ msgstr ""
 msgid "Remediated: needs review"
 msgstr ""
 
+msgid "Remediations"
+msgstr ""
+
 msgid "Remember me"
 msgstr ""
 
@@ -19842,6 +19851,9 @@ msgstr ""
 msgid "Settings to prevent self-approval across all projects in the instance. Only an administrator can modify these settings."
 msgstr ""
 
+msgid "Severity"
+msgstr ""
+
 msgid "Severity: %{severity}"
 msgstr ""
 
@@ -20174,6 +20186,9 @@ msgstr ""
 msgid "Snowplow"
 msgstr ""
 
+msgid "Solution"
+msgstr ""
+
 msgid "Some child epics may be hidden due to applied filters"
 msgstr ""