Merge branch 'georgekoltsov/update-bulk-import-entity-worker-deduplicate-strategy' into 'master'

Update BulkImports::EntityWorker deduplication strategy

See merge request gitlab-org/gitlab!84204

app/workers/bulk_imports/entity_worker.rb

@@ -4,17 +4,13 @@ module BulkImports
   class EntityWorker # rubocop:disable Scalability/IdempotentWorker
     include ApplicationWorker
 
+    idempotent!
+    deduplicate :until_executing
     data_consistency :always
-
     feature_category :importers
-
     sidekiq_options retry: false, dead: false
-
     worker_has_external_dependencies!
 
-    idempotent!
-    deduplicate :until_executed, including_scheduled: true
-
     def perform(entity_id, current_stage = nil)
       return if stage_running?(entity_id, current_stage)