diff options
author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-07-17 15:46:16 +0000 |
---|---|---|
committer | Mike Greiling <mike@pixelcog.com> | 2017-07-20 17:04:18 -0500 |
commit | de22666b2053122ddb3e3d9e3263cec7d53fb39d (patch) | |
tree | 419e15d92fbb2270fdc94eb4812011183adf0e0d | |
parent | 9cdfdac4455702563bf0231a0fd433d952b0311b (diff) | |
download | gitlab-ce-de22666b2053122ddb3e3d9e3263cec7d53fb39d.tar.gz |
Merge branch 'group-sub-settings-new-sidebar' into 'master'
Added sub-nav to new group sidebar settings
Closes #35140
See merge request !12907
-rw-r--r-- | app/views/layouts/nav/_new_group_sidebar.html.haml | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/app/views/layouts/nav/_new_group_sidebar.html.haml b/app/views/layouts/nav/_new_group_sidebar.html.haml index 7b68d11041e..c80308ed0de 100644 --- a/app/views/layouts/nav/_new_group_sidebar.html.haml +++ b/app/views/layouts/nav/_new_group_sidebar.html.haml @@ -55,7 +55,22 @@ %span Members - if current_user && can?(current_user, :admin_group, @group) - = nav_link(path: %w[groups#projects groups#edit]) do + = nav_link(path: %w[groups#projects groups#edit ci_cd#show]) do = link_to edit_group_path(@group), title: 'Settings' do %span Settings + %ul.sidebar-sub-level-items + = nav_link(path: 'groups#edit') do + = link_to edit_group_path(@group), title: 'General' do + %span + General + + = nav_link(path: 'groups#projects') do + = link_to projects_group_path(@group), title: 'Projects' do + %span + Projects + + = nav_link(controller: :ci_cd) do + = link_to group_settings_ci_cd_path(@group), title: 'Pipelines' do + %span + Pipelines |