summaryrefslogtreecommitdiff
path: root/app/views/layouts
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-10-07 16:20:31 +0200
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-10-07 16:20:31 +0200
commita30b68fe1ded96c5aafe4348d1afec269354c469 (patch)
tree20051e46b2d00d40cf73e2ef36e0005841d49063 /app/views/layouts
parent1e06cabf4a8fa4d4c7acb9898682a5b4b41a9f58 (diff)
downloadgitlab-ce-a30b68fe1ded96c5aafe4348d1afec269354c469.tar.gz
Move CI services to project settings area
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'app/views/layouts')
-rw-r--r--app/views/layouts/ci/_nav_project.html.haml5
-rw-r--r--app/views/layouts/nav/_project_settings.html.haml4
2 files changed, 2 insertions, 7 deletions
diff --git a/app/views/layouts/ci/_nav_project.html.haml b/app/views/layouts/ci/_nav_project.html.haml
index db631f24656..f094edbfa87 100644
--- a/app/views/layouts/ci/_nav_project.html.haml
+++ b/app/views/layouts/ci/_nav_project.html.haml
@@ -5,11 +5,6 @@
%span
Back to project
%li.separate-item
- = nav_link path: ['services#index', 'services#edit'] do
- = link_to ci_project_services_path(@project) do
- = icon('share fw')
- %span
- Services
= nav_link path: 'events#index' do
= link_to ci_project_events_path(@project) do
= icon('book fw')
diff --git a/app/views/layouts/nav/_project_settings.html.haml b/app/views/layouts/nav/_project_settings.html.haml
index f618a18870b..954dbe5d2b9 100644
--- a/app/views/layouts/nav/_project_settings.html.haml
+++ b/app/views/layouts/nav/_project_settings.html.haml
@@ -60,8 +60,8 @@
= icon('building fw')
%span
CI Settings
- = nav_link path: ['ci/services#index', 'ci/services#edit'] do
- = link_to ci_project_services_path(@project.gitlab_ci_project) do
+ = nav_link controller: 'ci_services' do
+ = link_to namespace_project_ci_services_path(@project.namespace, @project) do
= icon('share fw')
%span
CI Services