diff options
| author | Mike Greiling <mike@pixelcog.com> | 2019-06-21 20:53:22 +0000 |
|---|---|---|
| committer | Mike Greiling <mike@pixelcog.com> | 2019-06-21 20:53:22 +0000 |
| commit | c8c03f1d249c81947ab53dec83d99be342e5440d (patch) | |
| tree | c92f8ac9351a17cbc6571c7e51e752cbbd67e546 /app/views/admin | |
| parent | 82f5d90e5d7c3135790d4d83d58b762a85af5293 (diff) | |
| parent | aebf867aeee6fd6b9c4f7766b412133cdecd177d (diff) | |
| download | gitlab-ce-c8c03f1d249c81947ab53dec83d99be342e5440d.tar.gz | |
Merge branch '49814-display-in-admin-area-if-emails-are-verified-or-not' into 'master'
Resolve "Display in admin area if emails are verified or not"
Closes #49814
See merge request gitlab-org/gitlab-ce!29669
Diffstat (limited to 'app/views/admin')
| -rw-r--r-- | app/views/admin/users/show.html.haml | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/app/views/admin/users/show.html.haml b/app/views/admin/users/show.html.haml index dcd6f7c8078..5c6131db37d 100644 --- a/app/views/admin/users/show.html.haml +++ b/app/views/admin/users/show.html.haml @@ -32,11 +32,12 @@ %li %span.light Email: %strong - = mail_to @user.email + = render partial: 'shared/email_with_badge', locals: { email: mail_to(@user.email), verified: @user.confirmed? } - @user.emails.each do |email| %li %span.light Secondary email: - %strong= email.email + %strong + = render partial: 'shared/email_with_badge', locals: { email: email.email, verified: email.confirmed? } = link_to remove_email_admin_user_path(@user, email), data: { confirm: "Are you sure you want to remove #{email.email}?" }, method: :delete, class: "btn-sm btn btn-remove float-right", title: 'Remove secondary email', id: "remove_email_#{email.id}" do %i.fa.fa-times %li |