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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
d6da528b
Commit
d6da528b
authored
May 01, 2017
by
Mark Fletcher
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Note Ghost user and refer to user deletion documentation
+ Add a partial for displaying user deletion guidance
parent
03f13af5
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
16 additions
and
10 deletions
+16
-10
app/views/admin/users/show.html.haml
app/views/admin/users/show.html.haml
+1
-5
app/views/profiles/accounts/show.html.haml
app/views/profiles/accounts/show.html.haml
+1
-5
app/views/users/_deletion_guidance.html.haml
app/views/users/_deletion_guidance.html.haml
+10
-0
changelogs/unreleased/31383-admin-remove-user-text-incorrect.yml
...ogs/unreleased/31383-admin-remove-user-text-incorrect.yml
+4
-0
No files found.
app/views/admin/users/show.html.haml
View file @
d6da528b
...
@@ -175,11 +175,7 @@
...
@@ -175,11 +175,7 @@
.panel-body
.panel-body
-
if
@user
.
can_be_removed?
&&
can?
(
current_user
,
:destroy_user
,
@user
)
-
if
@user
.
can_be_removed?
&&
can?
(
current_user
,
:destroy_user
,
@user
)
%p
Deleting a user has the following effects:
%p
Deleting a user has the following effects:
%ul
=
render
'users/deletion_guidance'
,
user:
@user
%li
All user content like authored issues, snippets, comments will be removed
-
rp
=
@user
.
personal_projects
.
count
-
unless
rp
.
zero?
%li
#{
pluralize
rp
,
'personal project'
}
will be removed and cannot be restored
%br
%br
=
link_to
'Remove user'
,
[
:admin
,
@user
],
data:
{
confirm:
"USER
#{
@user
.
name
}
WILL BE REMOVED! Are you sure?"
},
method: :delete
,
class:
"btn btn-remove"
=
link_to
'Remove user'
,
[
:admin
,
@user
],
data:
{
confirm:
"USER
#{
@user
.
name
}
WILL BE REMOVED! Are you sure?"
},
method: :delete
,
class:
"btn btn-remove"
-
else
-
else
...
...
app/views/profiles/accounts/show.html.haml
View file @
d6da528b
...
@@ -118,11 +118,7 @@
...
@@ -118,11 +118,7 @@
-
if
@user
.
can_be_removed?
&&
can?
(
current_user
,
:destroy_user
,
@user
)
-
if
@user
.
can_be_removed?
&&
can?
(
current_user
,
:destroy_user
,
@user
)
%p
%p
Deleting an account has the following effects:
Deleting an account has the following effects:
%ul
=
render
'users/deletion_guidance'
,
user:
current_user
%li
All user content like authored issues, snippets, comments will be removed
-
rp
=
current_user
.
personal_projects
.
count
-
unless
rp
.
zero?
%li
#{
pluralize
rp
,
'personal project'
}
will be removed and cannot be restored
=
link_to
'Delete account'
,
user_registration_path
,
data:
{
confirm:
"REMOVE
#{
current_user
.
name
}
? Are you sure?"
},
method: :delete
,
class:
"btn btn-remove"
=
link_to
'Delete account'
,
user_registration_path
,
data:
{
confirm:
"REMOVE
#{
current_user
.
name
}
? Are you sure?"
},
method: :delete
,
class:
"btn btn-remove"
-
else
-
else
-
if
@user
.
solo_owned_groups
.
present?
-
if
@user
.
solo_owned_groups
.
present?
...
...
app/views/users/_deletion_guidance.html.haml
0 → 100644
View file @
d6da528b
-
user
=
local_assigns
.
fetch
(
:user
)
%ul
%li
%p
Certain user content will be moved to a system-wide "Ghost User" in order to maintain content for posterity. For further information, please refer to the
=
link_to
'user account deletion documentation.'
,
help_page_path
(
"user/profile/account/delete_account"
,
anchor:
"associated-records"
)
-
personal_projects_count
=
user
.
personal_projects
.
count
-
unless
personal_projects_count
.
zero?
%li
#{
pluralize
(
personal_projects_count
,
'personal project'
)
}
will be removed and cannot be restored
changelogs/unreleased/31383-admin-remove-user-text-incorrect.yml
0 → 100644
View file @
d6da528b
---
title
:
Note Ghost user and refer to user deletion documentation
merge_request
:
author
:
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