diff options
| author | Douwe Maan <douwe@gitlab.com> | 2018-03-07 21:06:37 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2018-03-07 21:06:37 +0000 |
| commit | 7f816aa70282912f11b47e45a866189b8b72532f (patch) | |
| tree | cd2911abdb9f13dab60dc844cf3a52c3fe8df997 | |
| parent | d41321aa6435079744033f3c97d08857ff3cf724 (diff) | |
| parent | deb4bfa4681f2bcec32ddf89cdd78ca0d14cfdda (diff) | |
| download | gitlab-ce-7f816aa70282912f11b47e45a866189b8b72532f.tar.gz | |
Merge branch 'backport-ee-3892-to-ce' into 'master'
Backport relevant changes from EE https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/4827 to CE
See merge request gitlab-org/gitlab-ce!17608
| -rw-r--r-- | app/models/project_team.rb | 9 | ||||
| -rw-r--r-- | app/services/users/destroy_service.rb | 2 |
2 files changed, 11 insertions, 0 deletions
diff --git a/app/models/project_team.rb b/app/models/project_team.rb index a9e5cfb8240..33280eda0b9 100644 --- a/app/models/project_team.rb +++ b/app/models/project_team.rb @@ -85,6 +85,15 @@ class ProjectTeam @masters ||= fetch_members(Gitlab::Access::MASTER) end + def owners + @owners ||= + if group + group.owners + else + [project.owner] + end + end + def import(source_project, current_user = nil) target_project = project diff --git a/app/services/users/destroy_service.rb b/app/services/users/destroy_service.rb index b71002433d6..06b604dad4d 100644 --- a/app/services/users/destroy_service.rb +++ b/app/services/users/destroy_service.rb @@ -49,6 +49,8 @@ module Users ::Projects::DestroyService.new(project, current_user, skip_repo: project.legacy_storage?).execute end + yield(user) if block_given? + MigrateToGhostUserService.new(user).execute unless options[:hard_delete] # Destroy the namespace after destroying the user since certain methods may depend on the namespace existing |