From f208794ce0f0007e1aa0e545fec65076ec444ed9 Mon Sep 17 00:00:00 2001
From: Gregory <11164960-ghavenga@users.noreply.gitlab.com>
Date: Mon, 30 Sep 2024 22:32:37 +0200
Subject: [PATCH] Remove unneeded cross db interaction suppressions
Changelog: removed
EE: true
---
.../create_from_vulnerability_data_service_spec.rb | 8 +-------
1 file changed, 1 insertion(+), 7 deletions(-)
diff --git a/ee/spec/services/merge_requests/create_from_vulnerability_data_service_spec.rb b/ee/spec/services/merge_requests/create_from_vulnerability_data_service_spec.rb
index 19b8f66ba0b61..060c30b27ace8 100644
--- a/ee/spec/services/merge_requests/create_from_vulnerability_data_service_spec.rb
+++ b/ee/spec/services/merge_requests/create_from_vulnerability_data_service_spec.rb
@@ -73,13 +73,7 @@
:dependency_scanning, :with_remediation,
dependency_scanning_finding_params
)
- Gitlab::Database::QueryAnalyzers::PreventCrossDatabaseModification.temporary_ignore_tables_in_transaction(
- %w[vulnerability_findings_remediations], url: 'https://gitlab.com/gitlab-org/gitlab/-/issues/480003'
- ) do
- Gitlab::Database.allow_cross_joins_across_databases(url: 'https://gitlab.com/gitlab-org/gitlab/-/issues/480003') do
- finding.remediations = Array.new(1) { create(:vulnerabilities_remediation, summary: "Upgrade saml2-js", file: remediation_patch_tempfile) }
- end
- end
+ finding.remediations = Array.new(1) { create(:vulnerabilities_remediation, summary: "Upgrade saml2-js", file: remediation_patch_tempfile) }
finding
end
--
GitLab