Merge branch '227290-fix-resolved-notification' into 'master'

Add missing resolvedOnDefaultBranch property

See merge request gitlab-org/gitlab!40483

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

@@ -323,6 +323,7 @@ export default {
           </gl-link>
           <issue-link v-if="issue(item)" :issue="issue(item)" />
           <vulnerability-comment-icon v-if="hasComments(item)" :vulnerability="item" />
+          <remediated-badge v-if="item.resolvedOnDefaultBranch" class="gl-ml-3" />
         </div>
         <div
           v-if="item.location"
@@ -336,7 +337,6 @@ export default {
             {{ createLocationString(item.location) }}
           </div>
         </div>
-        <remediated-badge v-if="item.resolvedOnDefaultBranch" class="ml-2" />
       </template>
 
       <template #cell(identifier)="{ item }">

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

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

ee/changelogs/unreleased/227290-fix-resolved-notification.yml

+---
+title: Fix remediated badge visibility on vulnerability list
+merge_request: 40483
+author:
+type: fixed