Read about our upcoming Code of Conduct on this issue

This instance was upgraded to Heptapod 0.28.1 today

Commit 6f8d9028 authored by Douwe Maan's avatar Douwe Maan
Browse files

Merge branch '49114-add-gitaly-servers-to-admin-overview-navigation-menu' into 'master'

Resolve "Add Gitaly Servers to Admin > Overview navigation menu"

Closes #49114

See merge request gitlab-org/gitlab-ce!20550
...@@ -6,14 +6,14 @@ ...@@ -6,14 +6,14 @@
= sprite_icon('admin', size: 24) = sprite_icon('admin', size: 24)
.sidebar-context-title Admin Area .sidebar-context-title Admin Area
%ul.sidebar-top-level-items %ul.sidebar-top-level-items
= nav_link(controller: %w(dashboard admin projects users groups jobs runners cohorts conversational_development_index), html_options: {class: 'home'}) do = nav_link(controller: %w(dashboard admin projects users groups jobs runners gitaly_servers cohorts conversational_development_index), html_options: {class: 'home'}) do
= link_to admin_root_path, class: 'shortcuts-tree' do = link_to admin_root_path, class: 'shortcuts-tree' do
.nav-icon-container .nav-icon-container
= sprite_icon('overview') = sprite_icon('overview')
%span.nav-item-name %span.nav-item-name
Overview Overview
%ul.sidebar-sub-level-items %ul.sidebar-sub-level-items
= nav_link(controller: %w(dashboard admin projects users groups jobs runners cohorts conversational_development_index), html_options: { class: "fly-out-top-item" } ) do = nav_link(controller: %w(dashboard admin projects users groups jobs runners gitaly_servers cohorts conversational_development_index), html_options: { class: "fly-out-top-item" } ) do
= link_to admin_root_path do = link_to admin_root_path do
%strong.fly-out-top-item-name %strong.fly-out-top-item-name
#{ _('Overview') } #{ _('Overview') }
...@@ -42,6 +42,10 @@ ...@@ -42,6 +42,10 @@
= link_to admin_runners_path, title: 'Runners' do = link_to admin_runners_path, title: 'Runners' do
%span %span
Runners Runners
= nav_link(controller: :gitaly_servers) do
= link_to admin_gitaly_servers_path, title: 'Gitaly Servers' do
%span
Gitaly Servers
= nav_link path: 'cohorts#index' do = nav_link path: 'cohorts#index' do
= link_to admin_cohorts_path, title: 'Cohorts' do = link_to admin_cohorts_path, title: 'Cohorts' do
%span %span
......
---
title: Gitaly Servers link into Admin > Overview navigation menu
merge_request: 20550
author:
type: added
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