Add latest changes from gitlab-org/gitlab@master

3 files changed, 6 insertions, 2 deletions

diff --git a/app/models/bulk_imports/failure.rb b/app/models/bulk_imports/failure.rb
index 44d16618c77..8a6077b523c 100644
--- a/app/models/bulk_imports/failure.rb
+++ b/app/models/bulk_imports/failure.rb
@@ -15,6 +15,10 @@ class BulkImports::Failure < ApplicationRecord
     pipeline_relation || default_relation
   end
 
+  def exception_message=(message)
+    super(::Projects::ImportErrorFilter.filter_message(message).truncate(255))
+  end
+
   private
 
   def pipeline_relation
diff --git a/app/workers/bulk_imports/pipeline_batch_worker.rb b/app/workers/bulk_imports/pipeline_batch_worker.rb
index 1f66d3ec7fa..142c85f3d6e 100644
--- a/app/workers/bulk_imports/pipeline_batch_worker.rb
+++ b/app/workers/bulk_imports/pipeline_batch_worker.rb
@@ -56,7 +56,7 @@ module BulkImports
         pipeline_class: tracker.pipeline_name,
         pipeline_step: 'pipeline_batch_worker_run',
         exception_class: exception.class.to_s,
-        exception_message: exception.message.truncate(255),
+        exception_message: exception.message,
         correlation_id_value: Labkit::Correlation::CorrelationId.current_or_new_id
       )
     end
diff --git a/app/workers/bulk_imports/pipeline_worker.rb b/app/workers/bulk_imports/pipeline_worker.rb
index 567a27b991d..2d54cb58f62 100644
--- a/app/workers/bulk_imports/pipeline_worker.rb
+++ b/app/workers/bulk_imports/pipeline_worker.rb
@@ -87,7 +87,7 @@ module BulkImports
         pipeline_class: pipeline_tracker.pipeline_name,
         pipeline_step: 'pipeline_worker_run',
         exception_class: exception.class.to_s,
-        exception_message: exception.message.truncate(255),
+        exception_message: exception.message,
         correlation_id_value: Labkit::Correlation::CorrelationId.current_or_new_id
       )
     end