Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Léo-Paul Géneau
gitlab-ce
Commits
deb4bfa4
Commit
deb4bfa4
authored
Mar 07, 2018
by
Tiago Botelho
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Backport relevant changes from EE
https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/4827
to CE
parent
ce819ece
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
0 deletions
+11
-0
app/models/project_team.rb
app/models/project_team.rb
+9
-0
app/services/users/destroy_service.rb
app/services/users/destroy_service.rb
+2
-0
No files found.
app/models/project_team.rb
View file @
deb4bfa4
...
@@ -85,6 +85,15 @@ class ProjectTeam
...
@@ -85,6 +85,15 @@ class ProjectTeam
@masters
||=
fetch_members
(
Gitlab
::
Access
::
MASTER
)
@masters
||=
fetch_members
(
Gitlab
::
Access
::
MASTER
)
end
end
def
owners
@owners
||=
if
group
group
.
owners
else
[
project
.
owner
]
end
end
def
import
(
source_project
,
current_user
=
nil
)
def
import
(
source_project
,
current_user
=
nil
)
target_project
=
project
target_project
=
project
...
...
app/services/users/destroy_service.rb
View file @
deb4bfa4
...
@@ -49,6 +49,8 @@ module Users
...
@@ -49,6 +49,8 @@ module Users
::
Projects
::
DestroyService
.
new
(
project
,
current_user
,
skip_repo:
project
.
legacy_storage?
).
execute
::
Projects
::
DestroyService
.
new
(
project
,
current_user
,
skip_repo:
project
.
legacy_storage?
).
execute
end
end
yield
(
user
)
if
block_given?
MigrateToGhostUserService
.
new
(
user
).
execute
unless
options
[
:hard_delete
]
MigrateToGhostUserService
.
new
(
user
).
execute
unless
options
[
:hard_delete
]
# Destroy the namespace after destroying the user since certain methods may depend on the namespace existing
# Destroy the namespace after destroying the user since certain methods may depend on the namespace existing
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment