summaryrefslogtreecommitdiff
path: root/app/views/admin/users
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2015-07-29 07:32:01 -0700
committerStan Hu <stanhu@gmail.com>2015-08-05 00:35:53 -0700
commit0c1ccda43fe04300a07a5f046a7c1cbae56cff32 (patch)
tree6d8a997d15e58813a78e0f2806543e0b2388f756 /app/views/admin/users
parent4c9ba632e9468a0a8f37a031d0be90645ee6be2c (diff)
downloadgitlab-ce-0c1ccda43fe04300a07a5f046a7c1cbae56cff32.tar.gz
Add "Confirm user" button in user admin page
Closes #2116 Closes https://github.com/gitlabhq/gitlabhq/issues/9502
Diffstat (limited to 'app/views/admin/users')
-rw-r--r--app/views/admin/users/show.html.haml10
1 files changed, 10 insertions, 0 deletions
diff --git a/app/views/admin/users/show.html.haml b/app/views/admin/users/show.html.haml
index 33730ff05df..a383ea57384 100644
--- a/app/views/admin/users/show.html.haml
+++ b/app/views/admin/users/show.html.haml
@@ -105,6 +105,16 @@
.col-md-6
- unless @user == current_user
+ - unless @user.confirmed?
+ .panel.panel-info
+ .panel-heading
+ Confirm user
+ .panel-body
+ - if @user.unconfirmed_email.present?
+ - email = " (#{@user.unconfirmed_email})"
+ %p This user has an unconfirmed email address#{email}. You may force a confirmation.
+ %br
+ = link_to 'Confirm user', confirm_admin_user_path(@user), method: :put, class: "btn btn-info", data: { confirm: 'Are you sure?' }
- if @user.blocked?
.panel.panel-info
.panel-heading