Add latest changes from gitlab-org/gitlab@14-5-stable-eev14.5.0-rc42

1 files changed, 6 insertions, 1 deletions

diff --git a/app/services/bulk_update_integration_service.rb b/app/services/bulk_update_integration_service.rb
index 45465ba3946..29c4d0cc220 100644
--- a/app/services/bulk_update_integration_service.rb
+++ b/app/services/bulk_update_integration_service.rb
@@ -12,7 +12,7 @@ class BulkUpdateIntegrationService
       Integration.where(id: batch_ids).update_all(integration_hash)
 
       if integration.data_fields_present?
-        integration.data_fields.class.where(service_id: batch_ids).update_all(data_fields_hash)
+        integration.data_fields.class.where(data_fields_foreign_key => batch_ids).update_all(data_fields_hash)
       end
     end
   end
@@ -22,6 +22,11 @@ class BulkUpdateIntegrationService
 
   attr_reader :integration, :batch
 
+  # service_id or integration_id
+  def data_fields_foreign_key
+    integration.data_fields.class.reflections['integration'].foreign_key
+  end
+
   def integration_hash
     integration.to_integration_hash.tap { |json| json['inherit_from_id'] = integration.inherit_from_id || integration.id }
   end