Add latest changes from gitlab-org/gitlab@master

3 files changed, 6 insertions, 2 deletions

diff --git a/lib/sidebars/menu_item.rb b/lib/sidebars/menu_item.rb
index bc10c4fb257..227a6970b2c 100644
--- a/lib/sidebars/menu_item.rb
+++ b/lib/sidebars/menu_item.rb
@@ -38,7 +38,8 @@ module Sidebars
         icon: sprite_icon,
         link: link,
         active_routes: active_routes,
-        pill_count: has_pill ? pill_count : nil
+        pill_count: has_pill ? pill_count : nil,
+        link_classes: container_html_options[:class]
         # Check whether support is needed for the following properties,
         # in order to get feature parity with the HAML renderer
         # https://gitlab.com/gitlab-org/gitlab/-/issues/391864
diff --git a/lib/sidebars/projects/menus/issues_menu.rb b/lib/sidebars/projects/menus/issues_menu.rb
index 38eab0e3b68..dd5d4458fbb 100644
--- a/lib/sidebars/projects/menus/issues_menu.rb
+++ b/lib/sidebars/projects/menus/issues_menu.rb
@@ -113,6 +113,7 @@ module Sidebars
             link: project_boards_path(context.project),
             super_sidebar_parent: ::Sidebars::Projects::SuperSidebarMenus::PlanMenu,
             active_routes: { controller: :boards },
+            container_html_options: { class: 'shortcuts-issue-boards' },
             item_id: :boards
           )
         end
diff --git a/lib/sidebars/projects/menus/repository_menu.rb b/lib/sidebars/projects/menus/repository_menu.rb
index 157dd379ed7..22f7b553884 100644
--- a/lib/sidebars/projects/menus/repository_menu.rb
+++ b/lib/sidebars/projects/menus/repository_menu.rb
@@ -57,6 +57,7 @@ module Sidebars
             link: project_tree_path(context.project, context.current_ref),
             super_sidebar_parent: ::Sidebars::Projects::SuperSidebarMenus::CodeMenu,
             active_routes: { controller: %w[tree blob blame edit_tree new_tree find_file] },
+            container_html_options: { class: 'shortcuts-tree' },
             item_id: :files
           )
         end
@@ -70,7 +71,7 @@ module Sidebars
             super_sidebar_parent: ::Sidebars::Projects::SuperSidebarMenus::CodeMenu,
             active_routes: { controller: %w(commit commits) },
             item_id: :commits,
-            container_html_options: { id: 'js-onboarding-commits-link' }
+            container_html_options: { id: 'js-onboarding-commits-link', class: 'shortcuts-commits' }
           )
         end
 
@@ -117,6 +118,7 @@ module Sidebars
             link: link,
             super_sidebar_parent: ::Sidebars::Projects::SuperSidebarMenus::CodeMenu,
             active_routes: { controller: :network },
+            container_html_options: { class: 'shortcuts-network' },
             item_id: :graphs
           )
         end