diff options
| author | Robert Schilling <rschilling@student.tugraz.at> | 2015-09-22 23:32:35 +0200 |
|---|---|---|
| committer | Robert Schilling <rschilling@student.tugraz.at> | 2015-09-22 23:32:35 +0200 |
| commit | 03fd5919a393b8784c601c76c3ed65912f4b522a (patch) | |
| tree | f10f01e1abfc517bea45b2c7631e479b556fa87e /app | |
| parent | e34f18a8d830d6f261080d1c78e41aa685743a25 (diff) | |
| parent | 4ad9b49a14885e7a08473280e9d7a176edf0fe78 (diff) | |
| download | gitlab-ce-03fd5919a393b8784c601c76c3ed65912f4b522a.tar.gz | |
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce
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 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" |