summaryrefslogtreecommitdiff
path: root/app/services/repositories/destroy_rollback_service.rb
diff options
context:
space:
mode:
Diffstat (limited to 'app/services/repositories/destroy_rollback_service.rb')
-rw-r--r--app/services/repositories/destroy_rollback_service.rb8
1 files changed, 7 insertions, 1 deletions
diff --git a/app/services/repositories/destroy_rollback_service.rb b/app/services/repositories/destroy_rollback_service.rb
index 5ef4e11bf55..a19e305607f 100644
--- a/app/services/repositories/destroy_rollback_service.rb
+++ b/app/services/repositories/destroy_rollback_service.rb
@@ -12,8 +12,14 @@ class Repositories::DestroyRollbackService < Repositories::BaseService
log_info(%Q{Repository "#{removal_path}" moved to "#{disk_path}" for repository "#{full_path}"})
success
- else
+ elsif repo_exists?(removal_path)
+ # If the repo does not exist, there is no need to return an
+ # error because there was nothing to do.
move_error(removal_path)
+ else
+ success
end
+ rescue Gitlab::Git::Repository::NoRepository
+ success
end
end