Merge branch...

Merge branch '118818-dismissed-fixed-vulnerability-findings-can-be-commented-upon-but-comment-is-never-shown' into 'master'

Fix dismissed vulnerability comment updates

See merge request gitlab-org/gitlab!25328

ee/app/assets/javascripts/vue_shared/security_reports/components/modal.vue

@@ -114,7 +114,9 @@ export default {
     dismissalFeedback() {
       return (
         this.vulnerability &&
-        (this.vulnerability.dismissal_feedback || this.vulnerability.dismissalFeedback)
+        // grouped security reports are populating `dismissalFeedback` and the dashboards `dismissal_feedback`
+        // https://gitlab.com/gitlab-org/gitlab/issues/207489 aims to use the same property in all cases
+        (this.vulnerability.dismissalFeedback || this.vulnerability.dismissal_feedback)
       );
     },
     isEditingExistingFeedback() {

ee/changelogs/unreleased/118818-dismissed-fixed-vulnerability-findings-can-be-commented-upon-bu.yml

+---
+title: Fix dismissed vulnerability comment updates
+merge_request: 25328
+author:
+type: fixed