Commit bf21b303 authored by Andrew Fontaine's avatar Andrew Fontaine

Merge branch '219122-investigate-duplicate-use-of-shorcuts-tree' into 'master'

Resolve "Investigate duplicate use of shorcuts-tree"

Closes #219122

See merge request gitlab-org/gitlab!36732
parents 9e145ff9 4452e0d4
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
= _('Admin Area') = _('Admin Area')
%ul.sidebar-top-level-items{ data: { qa_selector: 'admin_sidebar_overview_submenu_content' } } %ul.sidebar-top-level-items{ data: { qa_selector: 'admin_sidebar_overview_submenu_content' } }
= nav_link(controller: %w(dashboard admin admin/projects users groups jobs runners gitaly_servers), html_options: {class: 'home'}) do = nav_link(controller: %w(dashboard admin admin/projects users groups jobs runners gitaly_servers), html_options: {class: 'home'}) do
= link_to admin_root_path, class: 'shortcuts-tree' do = link_to admin_root_path do
.nav-icon-container .nav-icon-container
= sprite_icon('overview') = sprite_icon('overview')
%span.nav-item-name %span.nav-item-name
......
...@@ -362,7 +362,7 @@ ...@@ -362,7 +362,7 @@
- if project_nav_tab? :settings - if project_nav_tab? :settings
= nav_link(path: sidebar_settings_paths) do = nav_link(path: sidebar_settings_paths) do
= link_to edit_project_path(@project), class: 'shortcuts-tree' do = link_to edit_project_path(@project) do
.nav-icon-container .nav-icon-container
= sprite_icon('settings') = sprite_icon('settings')
%span.nav-item-name.qa-settings-item#js-onboarding-settings-link %span.nav-item-name.qa-settings-item#js-onboarding-settings-link
......
= nav_link(path: sidebar_external_tracker_paths) do = nav_link(path: sidebar_external_tracker_paths) do
= link_to project_integrations_jira_issues_path(@project), class: 'shortcuts-tree' do = link_to project_integrations_jira_issues_path(@project) do
.nav-icon-container .nav-icon-container
= sprite_icon('issues') = sprite_icon('issues')
%span.nav-item-name.qa-settings-item#js-onboarding-settings-link %span.nav-item-name.qa-settings-item#js-onboarding-settings-link
......
---
title: Resolve duplicate use of shorcuts-tree
merge_request: 36732
author:
type: other
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment