Merge branch '227113_add_resolved_on_default_branch_badge_to_vuln_list' into 'master'

Fix remediated badge on vulnerabilities list

See merge request gitlab-org/gitlab!38478

ee/app/assets/javascripts/security_dashboard/components/vulnerability_list.vue

@@ -336,7 +336,7 @@ export default {
             {{ createLocationString(item.location) }}
           </div>
         </div>
-        <remediated-badge v-if="item.resolved_on_default_branch" class="ml-2" />
+        <remediated-badge v-if="item.resolvedOnDefaultBranch" class="ml-2" />
       </template>
 
       <template #cell(identifier)="{ item }">

ee/app/assets/javascripts/security_dashboard/graphql/vulnerability.fragment.graphql

@@ -5,6 +5,7 @@ fragment Vulnerability on Vulnerability {
   severity
   vulnerabilityPath
   userNotesCount
+  resolvedOnDefaultBranch
   issueLinks(linkType: CREATED) {
     nodes {
       issue {

ee/changelogs/unreleased/227113_add_resolved_on_default_branch_badge_to_vuln_list.yml

+---
+title: Utilize `resolvedOnDefaultBranch` field to show the remediated badge on vulnerabilities
+  list
+merge_request: 38478
+author:
+type: fixed

ee/spec/frontend/security_dashboard/components/vulnerability_list_spec.js

@@ -289,7 +289,7 @@ describe('Vulnerability list component', () => {
 
     beforeEach(() => {
       newVulnerabilities = generateVulnerabilities();
-      newVulnerabilities[0].resolved_on_default_branch = true;
+      newVulnerabilities[0].resolvedOnDefaultBranch = true;
       wrapper = createWrapper({ props: { vulnerabilities: newVulnerabilities } });
     });