summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKushal Pandya <kushal@gitlab.com>2017-03-02 21:35:13 +0530
committerKushal Pandya <kushal@gitlab.com>2017-03-02 21:35:13 +0530
commitf4585563c07009a5e81d9ba5fdaf973dbd7177cc (patch)
treee139f8dcffb061a8f2bb05ac525aab3a827b60b6
parent9f03e689e006921a725cfa61272952df87fd7642 (diff)
downloadgitlab-ce-26348-cleanup-navigation-order.tar.gz
Update paths for `pipelines/charts`26348-cleanup-navigation-order
-rw-r--r--app/views/projects/commits/_head.html.haml8
-rw-r--r--app/views/projects/pipelines/_head.html.haml4
-rw-r--r--app/views/projects/pipelines/charts.html.haml6
3 files changed, 8 insertions, 10 deletions
diff --git a/app/views/projects/commits/_head.html.haml b/app/views/projects/commits/_head.html.haml
index d32be7d1c7b..dd6797f10c0 100644
--- a/app/views/projects/commits/_head.html.haml
+++ b/app/views/projects/commits/_head.html.haml
@@ -19,11 +19,9 @@
= link_to namespace_project_tags_path(@project.namespace, @project) do
Tags
- - unless @project.empty_repo?
- = nav_link(path: 'graphs#show') do
- = link_to namespace_project_graph_path(@project.namespace, @project, current_ref), title: 'Contributors', class: 'shortcuts-project-contributors' do
- %span
- Contributors
+ = nav_link(path: 'graphs#show') do
+ = link_to namespace_project_graph_path(@project.namespace, @project, current_ref) do
+ Contributors
= nav_link(controller: %w(network)) do
= link_to namespace_project_network_path(@project.namespace, @project, current_ref) do
diff --git a/app/views/projects/pipelines/_head.html.haml b/app/views/projects/pipelines/_head.html.haml
index 498047a6eb2..a5acb7ac4a5 100644
--- a/app/views/projects/pipelines/_head.html.haml
+++ b/app/views/projects/pipelines/_head.html.haml
@@ -22,7 +22,7 @@
Environments
- if @project.feature_available?(:builds, current_user) && !@project.empty_repo?
- = nav_link(path: 'pipelines#ci') do
- = link_to ci_namespace_project_pipelines_path(@project.namespace, @project) do
+ = nav_link(path: 'pipelines#charts') do
+ = link_to charts_namespace_project_pipelines_path(@project.namespace, @project), title: 'Charts', class: 'shortcuts-pipelines-charts' do
%span
Charts
diff --git a/app/views/projects/pipelines/charts.html.haml b/app/views/projects/pipelines/charts.html.haml
index c61cff0c0b7..8ffdfa1a2cf 100644
--- a/app/views/projects/pipelines/charts.html.haml
+++ b/app/views/projects/pipelines/charts.html.haml
@@ -13,9 +13,9 @@
#charts.ci-charts
.row
.col-md-6
- = render 'projects/pipelines/ci/overall'
+ = render 'projects/pipelines/charts/overall'
.col-md-6
- = render 'projects/pipelines/ci/build_times'
+ = render 'projects/pipelines/charts/build_times'
%hr
- = render 'projects/pipelines/ci/builds'
+ = render 'projects/pipelines/charts/builds'