Merge branch...

Merge branch '479586-resolve-cross-join-issues-in-gitlab-ee-app-services-vulnerabilities-create_service-rb' into 'master' 

Resolve cross join issues in gitlab/ee/app/services/vulnerabilities/create_service.rb

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/169431



Merged-by: Sashi Kumar Kumaresan <skumar@gitlab.com>
Approved-by: Sashi Kumar Kumaresan <skumar@gitlab.com>
Co-authored-by: Gregory <11164960-ghavenga@users.noreply.gitlab.com>

ee/app/services/vulnerabilities/create_service.rb

@@ -32,19 +32,15 @@ def execute
       vulnerability = Vulnerability.new
-      Gitlab::Database.allow_cross_joins_across_databases(
-        url: 'https://gitlab.com/gitlab-org/gitlab/-/issues/479586'
-      ) do
-        Vulnerabilities::Finding.transaction do
-          save_vulnerability(vulnerability, finding)
-        rescue ActiveRecord::RecordNotFound
-          vulnerability.errors.add(:base, _('finding is not found or is already attached to a vulnerability'))
-          raise ActiveRecord::Rollback
-        end
-
-        if vulnerability.persisted?
-          Statistics::UpdateService.update_for(vulnerability)
-        end
+      Vulnerabilities::Finding.transaction do
+        save_vulnerability(vulnerability, finding)
+      rescue ActiveRecord::RecordNotFound
+        vulnerability.errors.add(:base, _('finding is not found or is already attached to a vulnerability'))
+        raise ActiveRecord::Rollback
+      end
+
+      if vulnerability.persisted?
+        Statistics::UpdateService.update_for(vulnerability)
       end
       vulnerability