1 files changed, 4 insertions, 8 deletions
diff --git a/lib/gitlab/background_migration/user_mentions/create_resource_user_mention.rb b/lib/gitlab/background_migration/user_mentions/create_resource_user_mention.rb
index d71a50a0af6..b3876018553 100644
--- a/lib/gitlab/background_migration/user_mentions/create_resource_user_mention.rb
+++ b/lib/gitlab/background_migration/user_mentions/create_resource_user_mention.rb
@@ -12,26 +12,22 @@ module Gitlab
         ISOLATION_MODULE = 'Gitlab::BackgroundMigration::UserMentions::Models'
 
         def perform(resource_model, join, conditions, with_notes, start_id, end_id)
+          return unless Feature.enabled?(:migrate_user_mentions, default_enabled: true)
+
           resource_model = "#{ISOLATION_MODULE}::#{resource_model}".constantize if resource_model.is_a?(String)
           model = with_notes ? Gitlab::BackgroundMigration::UserMentions::Models::Note : resource_model
           resource_user_mention_model = resource_model.user_mention_model
 
           records = model.joins(join).where(conditions).where(id: start_id..end_id)
 
-          records.in_groups_of(BULK_INSERT_SIZE, false).each do |records|
+          records.each_batch(of: BULK_INSERT_SIZE) do |records|
             mentions = []
             records.each do |record|
               mention_record = record.build_mention_values(resource_user_mention_model.resource_foreign_key)
               mentions << mention_record unless mention_record.blank?
             end
 
-            Gitlab::Database.bulk_insert( # rubocop:disable Gitlab/BulkInsert
-              resource_user_mention_model.table_name,
-              mentions,
-              return_ids: true,
-              disable_quote: resource_model.no_quote_columns,
-              on_conflict: :do_nothing
-            )
+            resource_user_mention_model.insert_all(mentions) unless mentions.empty?
           end
         end
       end