diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-05-03 17:52:26 +0300 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-05-03 17:52:26 +0300 |
| commit | 57513512b9d0c92f100db7d438f239a256231c33 (patch) | |
| tree | 9e2cdbb253b84c2701caaeaef639e825e47bb217 /app/views/admin | |
| parent | f30ab49433c5fc8ee088d2795d02c9340ff5b06c (diff) | |
| parent | d6da528b458942cf66b18b834840e0a6dbba0fc9 (diff) | |
Merge branch '31383-admin-remove-user-text-incorrect' into 'master'
Note Ghost user and refer to user deletion documentation
Closes #31383
See merge request !11012
Diffstat (limited to 'app/views/admin')
| -rw-r--r-- | app/views/admin/users/show.html.haml | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/app/views/admin/users/show.html.haml b/app/views/admin/users/show.html.haml index 840d843f069..89d0bbb7126 100644 --- a/app/views/admin/users/show.html.haml +++ b/app/views/admin/users/show.html.haml @@ -175,11 +175,7 @@ .panel-body - if @user.can_be_removed? && can?(current_user, :destroy_user, @user) %p Deleting a user has the following effects: - %ul - %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 + = render 'users/deletion_guidance', user: @user %br = link_to 'Remove user', [:admin, @user], data: { confirm: "USER #{@user.name} WILL BE REMOVED! Are you sure?" }, method: :delete, class: "btn btn-remove" - else |