diff options
| author | Kushal Pandya <kushalspandya@gmail.com> | 2017-04-25 16:02:39 +0000 |
|---|---|---|
| committer | Alfredo Sumaran <alfredo@gitlab.com> | 2017-04-25 16:02:39 +0000 |
| commit | 03534bb2b85c9e525da8564229378dfd23af695f (patch) | |
| tree | 54e8a75cbc22c5fb88974309cb492df2d63a5e0f | |
| parent | b93cc690b03d921669cc8c4dc389e3e2afcbdc48 (diff) | |
| download | gitlab-ce-03534bb2b85c9e525da8564229378dfd23af695f.tar.gz | |
Add sub-nav for Project Integration Services edit page
4 files changed, 7 insertions, 2 deletions
diff --git a/app/views/layouts/nav/_project.html.haml b/app/views/layouts/nav/_project.html.haml index 37429c7cfc0..8ab9747efc5 100644 --- a/app/views/layouts/nav/_project.html.haml +++ b/app/views/layouts/nav/_project.html.haml @@ -56,7 +56,7 @@ Snippets - if project_nav_tab? :settings - = nav_link(path: %w[projects#edit members#show integrations#show repository#show ci_cd#show pages#show]) do + = nav_link(path: %w[projects#edit members#show integrations#show services#edit repository#show ci_cd#show pages#show]) do = link_to edit_project_path(@project), title: 'Settings', class: 'shortcuts-tree' do %span Settings diff --git a/app/views/projects/services/edit.html.haml b/app/views/projects/services/edit.html.haml index 50ed78286d2..0f1a76a104a 100644 --- a/app/views/projects/services/edit.html.haml +++ b/app/views/projects/services/edit.html.haml @@ -1,2 +1,3 @@ - page_title @service.title, "Services" += render "projects/settings/head" = render 'form' diff --git a/app/views/projects/settings/_head.html.haml b/app/views/projects/settings/_head.html.haml index 88bcb541dac..e50a543ffa8 100644 --- a/app/views/projects/settings/_head.html.haml +++ b/app/views/projects/settings/_head.html.haml @@ -14,7 +14,7 @@ %span Members - if can_edit - = nav_link(controller: :integrations) do + = nav_link(controller: [:integrations, :services]) do = link_to project_settings_integrations_path(@project), title: 'Integrations' do %span Integrations diff --git a/changelogs/unreleased/31174-project-integration-service-sub-nav.yml b/changelogs/unreleased/31174-project-integration-service-sub-nav.yml new file mode 100644 index 00000000000..f3f91f92428 --- /dev/null +++ b/changelogs/unreleased/31174-project-integration-service-sub-nav.yml @@ -0,0 +1,4 @@ +--- +title: Add sub-nav for Project Integration Services edit page +merge_request: 10813 +author: |