Add latest changes from gitlab-org/gitlab@15-3-stable-eev15.3.0-rc42

1 files changed, 9 insertions, 1 deletions

diff --git a/app/controllers/import/bulk_imports_controller.rb b/app/controllers/import/bulk_imports_controller.rb
index 2d607fb7ff7..893c0b6ac54 100644
--- a/app/controllers/import/bulk_imports_controller.rb
+++ b/app/controllers/import/bulk_imports_controller.rb
@@ -47,7 +47,14 @@ class Import::BulkImportsController < ApplicationController
   end
 
   def create
-    responses = create_params.map { |entry| ::BulkImports::CreateService.new(current_user, entry, credentials).execute }
+    responses = create_params.map do |entry|
+      if entry[:destination_name]
+        entry[:destination_slug] ||= entry[:destination_name]
+        entry.delete(:destination_name)
+      end
+
+      ::BulkImports::CreateService.new(current_user, entry, credentials).execute
+    end
 
     render json: responses.map { |response| { success: response.success?, id: response.payload[:id], message: response.message } }
   end
@@ -100,6 +107,7 @@ class Import::BulkImportsController < ApplicationController
       source_type
       source_full_path
       destination_name
+      destination_slug
       destination_namespace
     ]
   end