Add latest changes from gitlab-org/gitlab@13-4-stable-ee

7 files changed, 31 insertions, 27 deletions

diff --git a/app/views/admin/users/_form.html.haml b/app/views/admin/users/_form.html.haml
index 38c6c8b2a62..9e31c8d2852 100644
--- a/app/views/admin/users/_form.html.haml
+++ b/app/views/admin/users/_form.html.haml
@@ -87,8 +87,8 @@
 
     .form-actions
       - if @user.new_record?
-        = f.submit 'Create user', class: "btn btn-success"
+        = f.submit 'Create user', class: "btn gl-button btn-success"
         = link_to 'Cancel', admin_users_path, class: "btn btn-cancel"
       - else
-        = f.submit 'Save changes', class: "btn btn-success"
-        = link_to 'Cancel', admin_user_path(@user), class: "btn btn-cancel"
+        = f.submit 'Save changes', class: "btn gl-button btn-success"
+        = link_to 'Cancel', admin_user_path(@user), class: "btn gl-button btn-cancel"
diff --git a/app/views/admin/users/_modals.html.haml b/app/views/admin/users/_modals.html.haml
index eaec6d69f5a..6cf6dc116e3 100644
--- a/app/views/admin/users/_modals.html.haml
+++ b/app/views/admin/users/_modals.html.haml
@@ -16,7 +16,7 @@
     'secondary-action': s_('AdminUsers|Block user') } }
     = s_('AdminUsers|You are about to permanently delete the user %{username}. Issues, merge requests,
       and groups linked to them will be transferred to a system-wide "Ghost-user". To avoid data loss,
-      consider using the %{strong_start}block user%{strong_end} feature instead. Once you %{strong_start}Delete user%{strong_end},
+      consider using the %{strongStart}block user%{strongEnd} feature instead. Once you %{strongStart}Delete user%{strongEnd},
       it cannot be undone or recovered.')
 
   %div{ data: { modal: "delete-with-contributions",
diff --git a/app/views/admin/users/_user.html.haml b/app/views/admin/users/_user.html.haml
index 440eaac1917..160303890f5 100644
--- a/app/views/admin/users/_user.html.haml
+++ b/app/views/admin/users/_user.html.haml
@@ -17,9 +17,9 @@
   - unless user.internal?
     .table-section.section-20.table-button-footer
       .table-action-buttons
-        = link_to _('Edit'), edit_admin_user_path(user), id: "edit_#{dom_id(user)}", class: 'btn btn-default'
+        = link_to _('Edit'), edit_admin_user_path(user), id: "edit_#{dom_id(user)}", class: 'btn gl-button btn-default'
         - unless user == current_user
-          %button.dropdown-new.btn.btn-default{ type: 'button', data: { toggle: 'dropdown' } }
+          %button.dropdown-new.btn.gl-button.btn-default{ type: 'button', data: { toggle: 'dropdown' } }
             = sprite_icon('settings')
             = sprite_icon('chevron-down')
           %ul.dropdown-menu.dropdown-menu-right
@@ -32,13 +32,13 @@
                 - elsif user.blocked?
                   = link_to _('Unblock'), unblock_admin_user_path(user), method: :put
                 - else
-                  %button.btn{ data: { 'gl-modal-action': 'block',
+                  %button.btn.gl-button.btn-default-tertiary{ data: { 'gl-modal-action': 'block',
                     url: block_admin_user_path(user),
                     username: sanitize_name(user.name) } }
                     = s_('AdminUsers|Block')
               - if user.can_be_deactivated?
                 %li
-                  %button.btn{ data: { 'gl-modal-action': 'deactivate',
+                  %button.btn.gl-button.btn-default-tertiary{ data: { 'gl-modal-action': 'deactivate',
                     url: deactivate_admin_user_path(user),
                     username: sanitize_name(user.name) } }
                     = s_('AdminUsers|Deactivate')
@@ -52,13 +52,13 @@
               %li.divider
               - if user.can_be_removed?
                 %li
-                  %button.delete-user-button.btn.text-danger{ data: { 'gl-modal-action': 'delete',
+                  %button.delete-user-button.btn.gl-button.btn-default-tertiary.text-danger{ data: { 'gl-modal-action': 'delete',
                     delete_user_url: admin_user_path(user),
                     block_user_url: block_admin_user_path(user),
                     username: sanitize_name(user.name) } }
                     = s_('AdminUsers|Delete user')
                 %li
-                  %button.delete-user-button.btn.text-danger{ data: { 'gl-modal-action': 'delete-with-contributions',
+                  %button.delete-user-button.btn.gl-button.btn-default-tertiary.text-danger{ data: { 'gl-modal-action': 'delete-with-contributions',
                     delete_user_url: admin_user_path(user, hard_delete: true),
                     block_user_url: block_admin_user_path(user),
                     username: sanitize_name(user.name) } }
diff --git a/app/views/admin/users/index.html.haml b/app/views/admin/users/index.html.haml
index 05988c17412..118bdf7bb17 100644
--- a/app/views/admin/users/index.html.haml
+++ b/app/views/admin/users/index.html.haml
@@ -40,7 +40,7 @@
         %small.badge.badge-pill= limited_counter_with_delimiter(User.without_projects)
   .nav-controls
     = render_if_exists 'admin/users/admin_email_users'
-    = link_to s_('AdminUsers|New user'), new_admin_user_path, class: 'btn btn-success btn-search float-right'
+    = link_to s_('AdminUsers|New user'), new_admin_user_path, class: 'btn gl-button btn-success btn-search float-right'
 
 .filtered-search-block.row-content-block.border-top-0
   = form_tag admin_users_path, method: :get do
diff --git a/app/views/admin/users/new.html.haml b/app/views/admin/users/new.html.haml
index e5e6790b789..08aa7c3c9d2 100644
--- a/app/views/admin/users/new.html.haml
+++ b/app/views/admin/users/new.html.haml
@@ -1,5 +1,5 @@
 - page_title _("New User")
 %h3.page-title
-  New user
+  = s_('AdminUsers|New user')
 %hr
 = render 'form'
diff --git a/app/views/admin/users/projects.html.haml b/app/views/admin/users/projects.html.haml
index f66d9b76afc..70a497f14ff 100644
--- a/app/views/admin/users/projects.html.haml
+++ b/app/views/admin/users/projects.html.haml
@@ -16,8 +16,8 @@
           .float-right
             %span.light.vertical-align-middle= group_member.human_access
             - unless group_member.owner?
-              = link_to group_group_member_path(group, group_member), data: { confirm: remove_member_message(group_member) }, method: :delete, remote: true, class: "btn-sm btn btn-remove gl-ml-3", title: 'Remove user from group' do
-                %i.fa.fa-times.fa-inverse
+              = link_to group_group_member_path(group, group_member), data: { confirm: remove_member_message(group_member), testid: 'remove-user' }, method: :delete, remote: true, class: "btn btn-sm btn-danger gl-button btn-icon gl-ml-3", title: _('Remove user from group') do
+                = sprite_icon('close', size: 16, css_class: 'gl-icon')
 
 .row
   .col-md-6
@@ -46,5 +46,5 @@
                   %span.light.vertical-align-middle= member.human_access
 
                   - if member.respond_to? :project
-                    = link_to project_project_member_path(project, member), data: { confirm: remove_member_message(member) }, remote: true, method: :delete, class: "btn-sm btn btn-remove gl-ml-3", title: 'Remove user from project' do
-                      %i.fa.fa-times
+                    = link_to project_project_member_path(project, member), data: { confirm: remove_member_message(member) }, remote: true, method: :delete, class: "btn btn-sm btn-danger gl-button btn-icon gl-ml-3", title: 'Remove user from project' do
+                      = sprite_icon('close', size: 16, css_class: 'gl-icon')
diff --git a/app/views/admin/users/show.html.haml b/app/views/admin/users/show.html.haml
index 2bc39a23b2d..a08c29714e0 100644
--- a/app/views/admin/users/show.html.haml
+++ b/app/views/admin/users/show.html.haml
@@ -38,19 +38,23 @@
             %span.light Secondary 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
+            = link_to remove_email_admin_user_path(@user, email), data: { confirm: "Are you sure you want to remove #{email.email}?" }, method: :delete, class: "btn btn-sm btn-danger gl-button btn-icon float-right", title: 'Remove secondary email', id: "remove_email_#{email.id}" do
+              = sprite_icon('close', size: 16, css_class: 'gl-icon')
         %li
           %span.light ID:
           %strong
             = @user.id
+        %li
+          %span.light= _('Namespace ID:')
+          %strong
+            = @user.namespace_id
 
         %li.two-factor-status
           %span.light Two-factor Authentication:
           %strong{ class: @user.two_factor_enabled? ? 'cgreen' : 'cred' }
             - if @user.two_factor_enabled?
               Enabled
-              = link_to 'Disable', disable_two_factor_admin_user_path(@user), data: {confirm: 'Are you sure?'}, method: :patch, class: 'btn btn-sm btn-remove float-right', title: 'Disable Two-factor Authentication'
+              = link_to 'Disable', disable_two_factor_admin_user_path(@user), data: {confirm: 'Are you sure?'}, method: :patch, class: 'btn gl-button btn-sm btn-remove float-right', title: 'Disable Two-factor Authentication'
             - else
               Disabled
 
@@ -142,7 +146,7 @@
               - 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?', qa_selector: 'confirm_user_button' }
+            = link_to 'Confirm user', confirm_admin_user_path(@user), method: :put, class: "btn gl-button btn-info", data: { confirm: 'Are you sure?', qa_selector: 'confirm_user_button' }
 
       = render 'admin/users/user_detail_note'
 
@@ -153,7 +157,7 @@
           .card-body
             = render partial: 'admin/users/user_activation_effects'
             %br
-            = link_to 'Activate user', activate_admin_user_path(@user), method: :put, class: "btn btn-info", data: { confirm: 'Are you sure?' }
+            = link_to 'Activate user', activate_admin_user_path(@user), method: :put, class: "btn gl-button btn-info", data: { confirm: 'Are you sure?' }
       - elsif @user.can_be_deactivated?
         .card.border-warning
           .card-header.bg-warning.text-white
@@ -161,7 +165,7 @@
           .card-body
             = render partial: 'admin/users/user_deactivation_effects'
             %br
-            %button.btn.btn-warning{ data: { 'gl-modal-action': 'deactivate',
+            %button.btn.gl-button.btn-warning{ data: { 'gl-modal-action': 'deactivate',
               content: 'You can always re-activate their account, their data will remain intact.',
               url: deactivate_admin_user_path(@user),
               username: sanitize_name(@user.name) } }
@@ -177,7 +181,7 @@
               %li Log in
               %li Access Git repositories
             %br
-            = link_to 'Unblock user', unblock_admin_user_path(@user), method: :put, class: "btn btn-info", data: { confirm: 'Are you sure?' }
+            = link_to 'Unblock user', unblock_admin_user_path(@user), method: :put, class: "btn gl-button btn-info", data: { confirm: 'Are you sure?' }
       - else
         .card.border-warning
           .card-header.bg-warning.text-white
@@ -185,7 +189,7 @@
           .card-body
             = render partial: 'admin/users/user_block_effects'
             %br
-            %button.btn.btn-warning{ data: { 'gl-modal-action': 'block',
+            %button.btn.gl-button.btn-warning{ data: { 'gl-modal-action': 'block',
               content: 'You can always unblock their account, their data will remain intact.',
               url: block_admin_user_path(@user),
               username: sanitize_name(@user.name) } }
@@ -197,7 +201,7 @@
           .card-body
             %p This user has been temporarily locked due to excessive number of failed logins. You may manually unlock the account.
             %br
-            = link_to 'Unlock user', unlock_admin_user_path(@user), method: :put, class: "btn btn-info", data: { confirm: 'Are you sure?' }
+            = link_to 'Unlock user', unlock_admin_user_path(@user), method: :put, class: "btn gl-button btn-info", data: { confirm: 'Are you sure?' }
 
       .card.border-danger
         .card-header.bg-danger.text-white
@@ -207,7 +211,7 @@
             %p Deleting a user has the following effects:
             = render 'users/deletion_guidance', user: @user
             %br
-            %button.delete-user-button.btn.btn-danger{ data: { 'gl-modal-action': 'delete',
+            %button.delete-user-button.btn.gl-button.btn-danger{ data: { 'gl-modal-action': 'delete',
               delete_user_url: admin_user_path(@user),
               block_user_url: block_admin_user_path(@user),
               username: sanitize_name(@user.name) } }
@@ -237,7 +241,7 @@
               the user, and projects in them, will also be removed. Commits
               to other projects are unaffected.
             %br
-              %button.delete-user-button.btn.btn-danger{ data: { 'gl-modal-action': 'delete-with-contributions',
+              %button.delete-user-button.btn.gl-button.btn-danger{ data: { 'gl-modal-action': 'delete-with-contributions',
                 delete_user_url: admin_user_path(@user, hard_delete: true),
                 block_user_url: block_admin_user_path(@user),
                 username: @user.name } }