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/import/github/cancel_project_import_service.rb')
-rw-r--r--app/services/import/github/cancel_project_import_service.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/app/services/import/github/cancel_project_import_service.rb b/app/services/import/github/cancel_project_import_service.rb
index 62cd0c95eaf..740b9e5c2e7 100644
--- a/app/services/import/github/cancel_project_import_service.rb
+++ b/app/services/import/github/cancel_project_import_service.rb
@@ -7,13 +7,13 @@ module Import
return error('Not Found', :not_found) unless authorized_to_read?
return error('Unauthorized access', :forbidden) unless authorized_to_cancel?
- if project.import_in_progress?
+ if project.import_state.completed?
+ error(cannot_cancel_error_message, :bad_request)
+ else
project.import_state.cancel
metrics.track_canceled_import
success(project: project)
- else
- error(cannot_cancel_error_message, :bad_request)
end
end