diff --git a/ee/app/services/vulnerability_exports/export_service.rb b/ee/app/services/vulnerability_exports/export_service.rb index b14113abfdc04f668efc6466e98453b570c12ac8..7a3c5ab3ce25f88fe2207202b1a4f1a0d964d60b 100644 --- a/ee/app/services/vulnerability_exports/export_service.rb +++ b/ee/app/services/vulnerability_exports/export_service.rb @@ -56,7 +56,7 @@ def exporter end def vulnerabilities - if exportable.is_a?(Group) && ::Feature.enabled?(:group_vulnerabilities_optimized_query, exportable) + if exportable.is_a?(Group) scope = ::Vulnerability.unscoped # rubocop:disable CodeReuse/ActiveRecord opts = { diff --git a/ee/config/feature_flags/development/group_vulnerabilities_optimized_query.yml b/ee/config/feature_flags/development/group_vulnerabilities_optimized_query.yml deleted file mode 100644 index 55c1a13e2c452c7127a70e4c95eea25b519dd5a6..0000000000000000000000000000000000000000 --- a/ee/config/feature_flags/development/group_vulnerabilities_optimized_query.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -name: group_vulnerabilities_optimized_query -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/127180 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/426394 -milestone: '16.5' -type: development -group: group::threat insights -default_enabled: false diff --git a/ee/spec/services/vulnerability_exports/export_service_spec.rb b/ee/spec/services/vulnerability_exports/export_service_spec.rb index a6cb0adaf508bae39efa76a6b1f745a33781e6a6..c521735beb27fcd53249e341024be1cd50addb99 100644 --- a/ee/spec/services/vulnerability_exports/export_service_spec.rb +++ b/ee/spec/services/vulnerability_exports/export_service_spec.rb @@ -137,17 +137,6 @@ expect(rows.count).to eq(group.vulnerabilities.without_archived_projects.count) end - - context 'when group_vulnerabilities_optimized_query is disabled' do - before do - stub_feature_flags(group_vulnerabilities_optimized_query: false) - end - - it 'delegates vulnerability lookup to the finder' do - export - expect(mock_vulnerability_finder_service_object).to have_received(:execute) - end - end end end end