diff options
author | Douwe Maan <douwe@gitlab.com> | 2018-07-11 14:08:10 +0000 |
---|---|---|
committer | Douwe Maan <douwe@gitlab.com> | 2018-07-11 14:08:10 +0000 |
commit | 1bf54e092783f7ad388225d32ab79ac1e845559c (patch) | |
tree | bd7cae4da35268ccf0c3c53464c1b3806ae7cb34 | |
parent | 6d8c262593d3352c36a64d32dc2fa7901a415bfc (diff) | |
parent | 997453ce208d1161313925ba1ab9d3168f8e58ee (diff) | |
download | gitlab-ce-1bf54e092783f7ad388225d32ab79ac1e845559c.tar.gz |
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
-rw-r--r-- | app/views/layouts/nav/sidebar/_admin.html.haml | 8 | ||||
-rw-r--r-- | changelogs/unreleased/49114-add-gitaly-servers-to-admin-overview-navigation-menu.yml | 5 |
2 files changed, 11 insertions, 2 deletions
diff --git a/app/views/layouts/nav/sidebar/_admin.html.haml b/app/views/layouts/nav/sidebar/_admin.html.haml index 62402c32e08..4c73da4c75b 100644 --- a/app/views/layouts/nav/sidebar/_admin.html.haml +++ b/app/views/layouts/nav/sidebar/_admin.html.haml @@ -6,14 +6,14 @@ = sprite_icon('admin', size: 24) .sidebar-context-title Admin Area %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 .nav-icon-container = sprite_icon('overview') %span.nav-item-name Overview %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 %strong.fly-out-top-item-name #{ _('Overview') } @@ -42,6 +42,10 @@ = 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 + %span + Gitaly Servers = nav_link path: 'cohorts#index' do = link_to admin_cohorts_path, title: 'Cohorts' do %span diff --git a/changelogs/unreleased/49114-add-gitaly-servers-to-admin-overview-navigation-menu.yml b/changelogs/unreleased/49114-add-gitaly-servers-to-admin-overview-navigation-menu.yml new file mode 100644 index 00000000000..ab320450a1a --- /dev/null +++ b/changelogs/unreleased/49114-add-gitaly-servers-to-admin-overview-navigation-menu.yml @@ -0,0 +1,5 @@ +--- +title: Gitaly Servers link into Admin > Overview navigation menu +merge_request: 20550 +author: +type: added |