Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'app/services/bulk_imports/create_service.rb')
-rw-r--r--app/services/bulk_imports/create_service.rb5
1 files changed, 3 insertions, 2 deletions
diff --git a/app/services/bulk_imports/create_service.rb b/app/services/bulk_imports/create_service.rb
index 4c9c59ac504..636c636255f 100644
--- a/app/services/bulk_imports/create_service.rb
+++ b/app/services/bulk_imports/create_service.rb
@@ -118,9 +118,10 @@ module BulkImports
end
client.get("/#{entity_type}/#{source_entity_identifier}/export_relations/status")
+ rescue BulkImports::NetworkError => e
# the source instance will return a 404 if the feature is disabled as the endpoint won't be available
- rescue Gitlab::HTTP::BlockedUrlError
- rescue BulkImports::NetworkError
+ return if e.cause.is_a?(Gitlab::HTTP::BlockedUrlError)
+
raise ::BulkImports::Error.setting_not_enabled
end