Add latest changes from gitlab-org/gitlab@master

1 files changed, 6 insertions, 0 deletions

diff --git a/app/controllers/import/bulk_imports_controller.rb b/app/controllers/import/bulk_imports_controller.rb
index 93172a36dc4..655fc7854fe 100644
--- a/app/controllers/import/bulk_imports_controller.rb
+++ b/app/controllers/import/bulk_imports_controller.rb
@@ -47,6 +47,8 @@ class Import::BulkImportsController < ApplicationController
   end
 
   def create
+    return render json: { success: false }, status: :unprocessable_entity unless valid_create_params?
+
     responses = create_params.map do |entry|
       if entry[:destination_name]
         entry[:destination_slug] ||= entry[:destination_name]
@@ -102,6 +104,10 @@ class Import::BulkImportsController < ApplicationController
     params.permit(bulk_import: bulk_import_params)[:bulk_import]
   end
 
+  def valid_create_params?
+    create_params.all? { _1[:source_type] == 'group_entity' }
+  end
+
   def bulk_import_params
     %i[
       source_type