diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-01-18 22:00:14 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-01-18 22:00:14 +0300 |
commit | 05f0ebba3a2c8ddf39e436f412dc2ab5bf1353b2 (patch) | |
tree | 11d0f2a6ec31c7793c184106cedc2ded3d9a2cc5 /app/views/layouts/nav/sidebar | |
parent | ec73467c23693d0db63a797d10194da9e72a74af (diff) |
Add latest changes from gitlab-org/gitlab@15-8-stable-eev15.8.0-rc42
Diffstat (limited to 'app/views/layouts/nav/sidebar')
-rw-r--r-- | app/views/layouts/nav/sidebar/_admin.html.haml | 31 | ||||
-rw-r--r-- | app/views/layouts/nav/sidebar/_your_work.html.haml | 1 |
2 files changed, 23 insertions, 9 deletions
diff --git a/app/views/layouts/nav/sidebar/_admin.html.haml b/app/views/layouts/nav/sidebar/_admin.html.haml index 717175e8eb3..24b301fadce 100644 --- a/app/views/layouts/nav/sidebar/_admin.html.haml +++ b/app/views/layouts/nav/sidebar/_admin.html.haml @@ -7,14 +7,14 @@ %span.sidebar-context-title = _('Admin Area') %ul.sidebar-top-level-items{ data: { qa_selector: 'admin_overview_submenu_content' } } - = nav_link(controller: %w[dashboard admin admin/projects users groups admin/topics jobs runners gitaly_servers cohorts], html_options: {class: 'home'}) do + = nav_link(controller: %w[dashboard admin admin/projects users groups admin/topics gitaly_servers cohorts], html_options: {class: 'home'}) do = link_to admin_root_path, class: 'has-sub-items' do .nav-icon-container = sprite_icon('overview') %span.nav-item-name = _('Overview') %ul.sidebar-sub-level-items - = nav_link(controller: %w[dashboard admin admin/projects users groups jobs runners gitaly_servers cohorts], html_options: { class: "fly-out-top-item" }) do + = nav_link(controller: %w[dashboard admin admin/projects users groups gitaly_servers cohorts], html_options: { class: "fly-out-top-item" }) do = link_to admin_root_path do %strong.fly-out-top-item-name = _('Overview') @@ -39,18 +39,31 @@ = link_to admin_topics_path, title: _('Topics') do %span = _('Topics') - = nav_link path: 'jobs#index' do - = link_to admin_jobs_path, title: _('Jobs') do + = nav_link(controller: :gitaly_servers) do + = link_to admin_gitaly_servers_path, title: 'Gitaly Servers' do %span - = _('Jobs') - = nav_link path: ['runners#index', 'runners#show'] do + = _('Gitaly Servers') + + = nav_link(controller: %w[runners jobs]) do + = link_to admin_runners_path, class: 'has-sub-items' do + .nav-icon-container + = sprite_icon('rocket') + %span.nav-item-name + = _('CI/CD') + %ul.sidebar-sub-level-items + = nav_link(controller: %w[runners jobs], html_options: { class: "fly-out-top-item" }) do + = link_to admin_runners_path do + %strong.fly-out-top-item-name + = _('CI/CD') + %li.divider.fly-out-top-item + = nav_link(controller: :runners) do = link_to admin_runners_path, title: _('Runners') do %span = _('Runners') - = nav_link(controller: :gitaly_servers) do - = link_to admin_gitaly_servers_path, title: 'Gitaly Servers' do + = nav_link(controller: :jobs) do + = link_to admin_jobs_path, title: _('Jobs') do %span - = _('Gitaly Servers') + = _('Jobs') = nav_link(controller: admin_analytics_nav_links) do = link_to admin_dev_ops_reports_path, data: { qa_selector: 'admin_analytics_link' }, class: 'has-sub-items' do diff --git a/app/views/layouts/nav/sidebar/_your_work.html.haml b/app/views/layouts/nav/sidebar/_your_work.html.haml new file mode 100644 index 00000000000..0eba5045ab1 --- /dev/null +++ b/app/views/layouts/nav/sidebar/_your_work.html.haml @@ -0,0 +1 @@ += render partial: 'shared/nav/sidebar', object: Sidebars::YourWork::Panel.new(Sidebars::Context.new(current_user: current_user, container: nil)) |