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/projects/destroy_service.rb')
-rw-r--r--app/services/projects/destroy_service.rb6
1 files changed, 5 insertions, 1 deletions
diff --git a/app/services/projects/destroy_service.rb b/app/services/projects/destroy_service.rb
index a5c12384b59..0ae6fcb4d97 100644
--- a/app/services/projects/destroy_service.rb
+++ b/app/services/projects/destroy_service.rb
@@ -114,7 +114,11 @@ module Projects
# It's possible that the project was destroyed, but some after_commit
# hook failed and caused us to end up here. A destroyed model will be a frozen hash,
# which cannot be altered.
- project.update(delete_error: message, pending_delete: false) unless project.destroyed?
+ unless project.destroyed?
+ # Restrict project visibility if the parent group visibility was made more restrictive while the project was scheduled for deletion.
+ visibility_level = project.visibility_level_allowed_by_group? ? project.visibility_level : project.group.visibility_level
+ project.update(delete_error: message, pending_delete: false, visibility_level: visibility_level)
+ end
log_error("Deletion failed on #{project.full_path} with the following message: #{message}")
end