Add latest changes from gitlab-org/gitlab@master

1 files changed, 9 insertions, 1 deletions

diff --git a/app/services/bulk_imports/create_service.rb b/app/services/bulk_imports/create_service.rb
index 26d678cfe3c..01ff593be46 100644
--- a/app/services/bulk_imports/create_service.rb
+++ b/app/services/bulk_imports/create_service.rb
@@ -36,6 +36,8 @@ module BulkImports
     end
 
     def execute
+      validate!
+
       bulk_import = create_bulk_import
 
       Gitlab::Tracking.event(self.class.name, 'create', label: 'bulk_import_group')
@@ -43,7 +45,8 @@ module BulkImports
       BulkImportWorker.perform_async(bulk_import.id)
 
       ServiceResponse.success(payload: bulk_import)
-    rescue ActiveRecord::RecordInvalid, BulkImports::NetworkError => e
+
+    rescue ActiveRecord::RecordInvalid, BulkImports::Error, BulkImports::NetworkError => e
       ServiceResponse.error(
         message: e.message,
         http_status: :unprocessable_entity
@@ -52,6 +55,11 @@ module BulkImports
 
     private
 
+    def validate!
+      client.validate_instance_version!
+      client.validate_import_scopes!
+    end
+
     def create_bulk_import
       BulkImport.transaction do
         bulk_import = BulkImport.create!(