diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-06-03 15:02:33 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-06-03 15:02:33 +0000 |
| commit | fb59f04fdf9d9417fcf82a24d12f740a7f136cd0 (patch) | |
| tree | 09dfbdecc527d45876810de2f907293f2465aa0b /app/services/projects/destroy_service.rb | |
| parent | 8046b69761b8535726e12319491f2c39305adf3d (diff) | |
| parent | 55715735d10c3c35e52af6b67c99dcdbb5c7bf97 (diff) | |
| download | gitlab-ce-fb59f04fdf9d9417fcf82a24d12f740a7f136cd0.tar.gz | |
Merge branch 'fix-group-remove' into 'master'
Group improvements
* remove projects before removing group
* execute all hooks/events from project destroy when group removed
* log group create/remove
* delay remove of namespace directory (to prevent NFS issues)
Inspired by !759
See merge request !761
Diffstat (limited to 'app/services/projects/destroy_service.rb')
| -rw-r--r-- | app/services/projects/destroy_service.rb | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/app/services/projects/destroy_service.rb b/app/services/projects/destroy_service.rb index 29e8ba347d4..403f419ec50 100644 --- a/app/services/projects/destroy_service.rb +++ b/app/services/projects/destroy_service.rb @@ -36,9 +36,11 @@ module Projects private def remove_repository(path) - unless gitlab_shell.exists?(path + '.git') - return true - end + # Skip repository removal. We use this flag when remove user or group + return true if params[:skip_repo] == true + + # There is a possibility project does not have repository or wiki + return true unless gitlab_shell.exists?(path + '.git') new_path = removal_path(path) |