diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-12-10 12:09:18 +0200 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-12-10 12:09:18 +0200 |
| commit | 16697f6efa4653986753905ab9100fa11dde7f09 (patch) | |
| tree | 8186f4ff4b90ac4c34ec22727b764f562d997f8d /app | |
| parent | 6a90378daedcba7efc167cdfa0e1ac7306809391 (diff) | |
| parent | 27900efb972b84b1a31f2a92cbc9272073a94338 (diff) | |
| download | gitlab-ce-16697f6efa4653986753905ab9100fa11dde7f09.tar.gz | |
Merge branch 'master' of github.com:gitlabhq/gitlabhq
Diffstat (limited to 'app')
| -rw-r--r-- | app/views/admin/users/index.html.haml | 2 |
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" |