Merge branch '46877-bootstrap-4-lists' into 'master'

Resolve ""well-list" is removed from Bootstrap 4"

Closes #46877

See merge request gitlab-org/gitlab-ce!19207

5 files changed, 12 insertions, 12 deletions

diff --git a/app/views/admin/groups/show.html.haml b/app/views/admin/groups/show.html.haml
index 5ec612d0c72..6d75ccd5add 100644
--- a/app/views/admin/groups/show.html.haml
+++ b/app/views/admin/groups/show.html.haml
@@ -13,7 +13,7 @@
     .card
       .card-header
         Group info:
-      %ul.well-list
+      %ul.content-list
         %li
           .avatar-container.s60
             = group_icon(@group, class: "avatar s60")
@@ -64,7 +64,7 @@
           Projects
           %span.badge.badge-pill
             #{@group.projects.count}
-      %ul.well-list
+      %ul.content-list
         - @projects.each do |project|
           %li
             %strong
@@ -82,7 +82,7 @@
           Projects shared with #{@group.name}
           %span.badge.badge-pill
             #{@group.shared_projects.count}
-        %ul.well-list
+        %ul.content-list
           - @group.shared_projects.sort_by(&:name).each do |project|
             %li
               %strong
@@ -118,7 +118,7 @@
         %span.badge.badge-pill= @group.members.size
         .float-right
           = link_to icon('pencil-square-o', text: 'Manage access'), polymorphic_url([@group, :members]), class: "btn btn-sm"
-      %ul.well-list.group-users-list.content-list.members-list
+      %ul.content-list.group-users-list.content-list.members-list
         = render partial: 'shared/members/member', collection: @members, as: :member, locals: { show_controls: false }
       .card-footer
         = paginate @members, param_name: 'members_page', theme: 'gitlab'
diff --git a/app/views/admin/projects/show.html.haml b/app/views/admin/projects/show.html.haml
index 29ec712b6b7..0a22a142858 100644
--- a/app/views/admin/projects/show.html.haml
+++ b/app/views/admin/projects/show.html.haml
@@ -22,7 +22,7 @@
     .card
       .card-header
         Project info:
-      %ul.well-list
+      %ul.content-list
         %li
           %span.light Name:
           %strong
@@ -166,7 +166,7 @@
           .float-right
             = link_to admin_group_path(@group), class: 'btn btn-sm' do
               = icon('pencil-square-o', text: 'Manage access')
-        %ul.well-list.content-list.members-list
+        %ul.content-list.members-list
           = render partial: 'shared/members/member', collection: @group_members, as: :member, locals: { show_controls: false }
         .card-footer
           = paginate @group_members, param_name: 'group_members_page', theme: 'gitlab'
@@ -180,7 +180,7 @@
         %span.badge.badge-pill= @project.users.size
         .float-right
           = link_to icon('pencil-square-o', text: 'Manage access'), polymorphic_url([@project, :members]), class: "btn btn-sm"
-      %ul.well-list.project_members.content-list.members-list
+      %ul.content-list.project_members.members-list
         = render partial: 'shared/members/member', collection: @project_members, as: :member, locals: { show_controls: false }
       .card-footer
         = paginate @project_members, param_name: 'project_members_page', theme: 'gitlab'
diff --git a/app/views/admin/users/_profile.html.haml b/app/views/admin/users/_profile.html.haml
index af22652e07c..4fcb9aad343 100644
--- a/app/views/admin/users/_profile.html.haml
+++ b/app/views/admin/users/_profile.html.haml
@@ -1,7 +1,7 @@
 .card
   .card-header
     Profile
-  %ul.well-list
+  %ul.content-list
     %li
       %span.light Member since
       %strong= user.created_at.to_s(:medium)
diff --git a/app/views/admin/users/projects.html.haml b/app/views/admin/users/projects.html.haml
index 469a7bd9715..cf50d45f755 100644
--- a/app/views/admin/users/projects.html.haml
+++ b/app/views/admin/users/projects.html.haml
@@ -4,7 +4,7 @@
 - if @user.groups.any?
   .card
     .card-header Group projects
-    %ul.card-body-list
+    %ul.hover-list
       - @user.group_members.includes(:source).each do |group_member|
         - group = group_member.group
         %li.group_member
@@ -28,7 +28,7 @@
   .col-md-6
     .card
       .card-header Joined projects (#{@joined_projects.count})
-      %ul.card-body-list
+      %ul.hover-list
         - @joined_projects.sort_by(&:full_name).each do |project|
           - member = project.team.find_member(@user.id)
           %li.project_member
diff --git a/app/views/admin/users/show.html.haml b/app/views/admin/users/show.html.haml
index a74fcea65d8..b0562226f5f 100644
--- a/app/views/admin/users/show.html.haml
+++ b/app/views/admin/users/show.html.haml
@@ -8,7 +8,7 @@
     .card
       .card-header
         = @user.name
-      %ul.well-list
+      %ul.content-list
         %li
           = image_tag avatar_icon_for_user(@user, 60), class: "avatar s60"
         %li
@@ -21,7 +21,7 @@
     .card
       .card-header
         Account:
-      %ul.well-list
+      %ul.content-list
         %li
           %span.light Name:
           %strong= @user.name