Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-12-10 13:47:35 +0400
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-12-10 13:47:35 +0400
commit27900efb972b84b1a31f2a92cbc9272073a94338 (patch)
treea80b75f95fa721b979b50eaba698b37df650b06b /app
parent2f148190c42d857a8580b178eb45c3e4394e7356 (diff)
parent00d72e73c855613b7e07158a8975796dec7cf9ad (diff)
Merge pull request #5779 from jvanbaarsen/patch-1
Better warning when deleting a user
Diffstat (limited to 'app')
-rw-r--r--app/views/admin/users/index.html.haml2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/admin/users/index.html.haml b/app/views/admin/users/index.html.haml
index 9c5796a661d..950f1a02713 100644
--- a/app/views/admin/users/index.html.haml
+++ b/app/views/admin/users/index.html.haml
@@ -54,5 +54,5 @@
= link_to 'Unblock', unblock_admin_user_path(user), method: :put, class: "btn btn-small success"
- else
= link_to 'Block', block_admin_user_path(user), confirm: 'USER WILL BE BLOCKED! Are you sure?', method: :put, class: "btn btn-small btn-remove"
- = link_to 'Destroy', [:admin, user], confirm: "USER #{user.name} WILL BE REMOVED! Are you sure?", method: :delete, class: "btn btn-small btn-remove"
+ = link_to 'Destroy', [:admin, user], confirm: "USER #{user.name} WILL BE REMOVED! All tickets linked to this user will also be removed! Maybe block the user instead? Are you sure?", method: :delete, class: "btn btn-small btn-remove"
= paginate @users, theme: "gitlab"