Merge branch '288347-remove-ff-autofix-indicator' into 'master'

Remove feature flag autofix indicator [RUN ALL RSPEC] [RUN AS-IF-FOSS]

See merge request gitlab-org/gitlab!51998

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

@@ -4,15 +4,10 @@ import produce from 'immer';
 import { __ } from '~/locale';
 import securityScannersQuery from '../graphql/queries/project_security_scanners.query.graphql';
 import vulnerabilitiesQuery from '../graphql/queries/project_vulnerabilities.query.graphql';
-import vulnerabilitiesQueryAutoFix from '../graphql/queries/project_vulnerabilities_autofix.query.graphql';
 import { preparePageInfo } from '../helpers';
 import { VULNERABILITIES_PER_PAGE } from '../store/constants';
 import VulnerabilityList from './vulnerability_list.vue';
 
-const query = gon?.features?.secureVulnerabilityAutofixIndicator
-  ? vulnerabilitiesQueryAutoFix
-  : vulnerabilitiesQuery;
-
 export default {
   name: 'ProjectVulnerabilitiesApp',
   components: {
@@ -41,7 +36,7 @@ export default {
   },
   apollo: {
     vulnerabilities: {
-      query,
+      query: vulnerabilitiesQuery,
       variables() {
         return {
           fullPath: this.projectFullPath,

ee/app/assets/javascripts/security_dashboard/graphql/queries/project_vulnerabilities.query.graphql

@@ -23,6 +23,13 @@ query project(
     ) {
       nodes {
         ...Vulnerability
+        hasSolutions
+        mergeRequest {
+          webUrl
+          state
+          securityAutoFix
+          iid
+        }
       }
       pageInfo {
         ...PageInfo

ee/app/assets/javascripts/security_dashboard/graphql/queries/project_vulnerabilities_autofix.query.graphql

-#import "~/graphql_shared/fragments/pageInfoCursorsOnly.fragment.graphql"
-#import "../fragments/vulnerability.fragment.graphql"
-
-query project(
-  $fullPath: ID!
-  $after: String
-  $first: Int
-  $severity: [VulnerabilitySeverity!]
-  $reportType: [VulnerabilityReportType!]
-  $scanner: [String!]
-  $state: [VulnerabilityState!]
-  $sort: VulnerabilitySort
-) {
-  project(fullPath: $fullPath) {
-    vulnerabilities(
-      after: $after
-      first: $first
-      severity: $severity
-      reportType: $reportType
-      scanner: $scanner
-      state: $state
-      sort: $sort
-    ) {
-      nodes {
-        ...Vulnerability
-        hasSolutions
-        mergeRequest {
-          webUrl
-          state
-          securityAutoFix
-          iid
-        }
-      }
-      pageInfo {
-        ...PageInfo
-      }
-    }
-  }
-}

ee/app/controllers/projects/security/vulnerability_report_controller.rb

@@ -5,10 +5,6 @@ module Projects
     class VulnerabilityReportController < Projects::ApplicationController
       include SecurityDashboardsPermissions
 
-      before_action do
-        push_frontend_feature_flag(:secure_vulnerability_autofix_indicator, @project, default_enabled: true)
-      end
-
       feature_category :vulnerability_management
 
       alias_method :vulnerable, :project

ee/config/feature_flags/development/secure_vulnerability_autofix_indicator.yml

----
-name: secure_vulnerability_autofix_indicator
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/48251/
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/288347
-milestone: '13.7'
-type: development
-group: group::composition analysis
-default_enabled: true