diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-02-11 02:13:44 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-02-11 02:13:44 +0300 |
| commit | 63f0bc0999ba2c4a7778097aacc6b87efd39e9e6 (patch) | |
| tree | 6a75a0a171089fae908f43b5ba61ca7c648862b5 /app/services/projects | |
| parent | efdc7889a59a7e5a52f8bacb578de2d40beb5871 (diff) | |
Add latest changes from gitlab-org/security/gitlab@13-8-stable-ee
Diffstat (limited to 'app/services/projects')
| -rw-r--r-- | app/services/projects/destroy_service.rb | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/app/services/projects/destroy_service.rb b/app/services/projects/destroy_service.rb index bec75657530..c1501625300 100644 --- a/app/services/projects/destroy_service.rb +++ b/app/services/projects/destroy_service.rb @@ -21,11 +21,14 @@ module Projects def execute return false unless can?(current_user, :remove_project, project) + project.update_attribute(:pending_delete, true) # Flush the cache for both repositories. This has to be done _before_ # removing the physical repositories as some expiration code depends on # Git data (e.g. a list of branch names). flush_caches(project) + ::Ci::AbortProjectPipelinesService.new.execute(project) + Projects::UnlinkForkService.new(project, current_user).execute attempt_destroy(project) |