diff options
| author | Robert Speicher <robert@gitlab.com> | 2015-09-22 21:09:09 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2015-09-22 21:09:09 +0000 |
| commit | 4ad9b49a14885e7a08473280e9d7a176edf0fe78 (patch) | |
| tree | f10f01e1abfc517bea45b2c7631e479b556fa87e | |
| parent | b64d81e9bf8cebea4d918b6cf779cea2f4f2b760 (diff) | |
| parent | 3a4c5986fb9e1cf5511a491ffd2902c4c70a6e05 (diff) | |
| download | gitlab-ce-4ad9b49a14885e7a08473280e9d7a176edf0fe78.tar.gz | |
Merge branch 'clarify-text' into 'master'
Clarify confirmation text on user deletion.
See #1699
Some users thought it was ok to delete the user because they'd only use the issues.
This clarifies a bit better what's being deleted when you delete a user.
See merge request !1382
| -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 5e40d95d1c5..e3698ac1c46 100644 --- a/app/views/admin/users/index.html.haml +++ b/app/views/admin/users/index.html.haml @@ -97,5 +97,5 @@ - if user.access_locked? = link_to 'Unlock', unlock_admin_user_path(user), method: :put, class: "btn btn-xs btn-success", data: { confirm: 'Are you sure?' } - if user.can_be_removed? - = link_to 'Destroy', [:admin, user], data: { 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-xs btn-remove" + = link_to 'Destroy', [:admin, user], data: { confirm: "USER #{user.name} WILL BE REMOVED! All issues, merge requests and groups linked to this user will also be removed! Maybe block the user instead? Are you sure?" }, method: :delete, class: "btn btn-xs btn-remove" = paginate @users, theme: "gitlab" |