Add latest changes from gitlab-org/gitlab@14-4-stable-eev14.4.0-rc42

2 files changed, 7 insertions, 17 deletions

diff --git a/app/views/dashboard/_activity_head.html.haml b/app/views/dashboard/_activity_head.html.haml
index 0daadd20f54..c65b947d1ba 100644
--- a/app/views/dashboard/_activity_head.html.haml
+++ b/app/views/dashboard/_activity_head.html.haml
@@ -2,13 +2,7 @@
   %h1.page-title= _('Activity')
 
 .top-area
-  %ul.nav-links.nav.nav-tabs
-    %li{ class: active_when(params[:filter].nil?) }>
-      = link_to activity_dashboard_path, class: 'shortcuts-activity', data: {placement: 'right'} do
-        = _('Your projects')
-    %li{ class: active_when(params[:filter] == 'starred') }>
-      = link_to activity_dashboard_path(filter: 'starred'), data: {placement: 'right'} do
-        = _('Starred projects')
-    %li{ class: active_when(params[:filter] == 'followed') }>
-      = link_to activity_dashboard_path(filter: 'followed'), data: {placement: 'right'} do
-        = _('Followed users')
+  = gl_tabs_nav({ class: 'gl-border-b-0', data: { testid: 'dashboard-activity-tabs' } }) do
+    = gl_tab_link_to _("Your projects"), activity_dashboard_path, { item_active: params[:filter].nil? }
+    = gl_tab_link_to _("Starred projects"), activity_dashboard_path(filter: 'starred')
+    = gl_tab_link_to _("Followed users"), activity_dashboard_path(filter: 'followed')
diff --git a/app/views/dashboard/_groups_head.html.haml b/app/views/dashboard/_groups_head.html.haml
index b92f35c108c..7b1d25b9b43 100644
--- a/app/views/dashboard/_groups_head.html.haml
+++ b/app/views/dashboard/_groups_head.html.haml
@@ -6,13 +6,9 @@
       = link_to _("New group"), new_group_path, class: "gl-button btn btn-confirm", data: { testid: "new-group-button" }
 
 .top-area
-  %ul.nav-links.mobile-separator.nav.nav-tabs
-    = nav_link(page: dashboard_groups_path) do
-      = link_to dashboard_groups_path, title: _("Your groups") do
-        Your groups
-    = nav_link(page: explore_groups_path) do
-      = link_to explore_groups_path, title: _("Explore public groups") do
-        Explore public groups
+  = gl_tabs_nav({ class: 'gl-flex-grow-1 gl-border-0' }) do
+    = gl_tab_link_to _("Your groups"), dashboard_groups_path
+    = gl_tab_link_to _("Explore public groups"), explore_groups_path
   .nav-controls
     = render 'shared/groups/search_form'
     = render 'shared/groups/dropdown'