Move Network page from separate tab to sub tab of Commits

Signed-off-by: default avatarDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
parent 6213263d
...@@ -25,6 +25,7 @@ v 8.3.0 (unreleased) ...@@ -25,6 +25,7 @@ v 8.3.0 (unreleased)
- Add languages page to graphs - Add languages page to graphs
- Block LDAP user when they are no longer found in the LDAP server - Block LDAP user when they are no longer found in the LDAP server
- Improve wording on project visibility levels (Zeger-Jan van de Weg) - Improve wording on project visibility levels (Zeger-Jan van de Weg)
- Make Network page as sub tab of Commits
v 8.2.3 v 8.2.3
- Fix application settings cache not expiring after changes (Stan Hu) - Fix application settings cache not expiring after changes (Stan Hu)
......
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
Files Files
- if project_nav_tab? :commits - if project_nav_tab? :commits
= nav_link(controller: %w(commit commits compare repositories tags branches releases)) do = nav_link(controller: %w(commit commits compare repositories tags branches releases network)) do
= link_to project_commits_path(@project), title: 'Commits', class: 'shortcuts-commits' do = link_to project_commits_path(@project), title: 'Commits', class: 'shortcuts-commits' do
= icon('history fw') = icon('history fw')
%span %span
...@@ -46,13 +46,6 @@ ...@@ -46,13 +46,6 @@
Builds Builds
%span.count.builds_counter= @project.ci_builds.running_or_pending.count(:all) %span.count.builds_counter= @project.ci_builds.running_or_pending.count(:all)
- if project_nav_tab? :network
= nav_link(controller: %w(network)) do
= link_to namespace_project_network_path(@project.namespace, @project, current_ref), title: 'Network', class: 'shortcuts-network' do
= icon('code-fork fw')
%span
Network
- if project_nav_tab? :graphs - if project_nav_tab? :graphs
= nav_link(controller: %w(graphs)) do = nav_link(controller: %w(graphs)) do
= link_to namespace_project_graph_path(@project.namespace, @project, current_ref), title: 'Graphs', class: 'shortcuts-graphs' do = link_to namespace_project_graph_path(@project.namespace, @project, current_ref), title: 'Graphs', class: 'shortcuts-graphs' do
...@@ -118,3 +111,10 @@ ...@@ -118,3 +111,10 @@
= icon('cogs fw') = icon('cogs fw')
%span %span
Settings Settings
-# Global shortcut to network page for compatibility
- if project_nav_tab? :network
%li.hidden
= link_to namespace_project_network_path(@project.namespace, @project, current_ref), title: 'Network', class: 'shortcuts-network' do
Network
...@@ -3,6 +3,12 @@ ...@@ -3,6 +3,12 @@
= link_to namespace_project_commits_path(@project.namespace, @project, current_ref) do = link_to namespace_project_commits_path(@project.namespace, @project, current_ref) do
Commits Commits
%span.badge= number_with_delimiter(@repository.commit_count) %span.badge= number_with_delimiter(@repository.commit_count)
- if project_nav_tab? :network
= nav_link(controller: %w(network)) do
= link_to namespace_project_network_path(@project.namespace, @project, current_ref), class: 'shortcuts-network' do
Network
= nav_link(controller: :compare) do = nav_link(controller: :compare) do
= link_to namespace_project_compare_index_path(@project.namespace, @project, from: @repository.root_ref, to: current_ref) do = link_to namespace_project_compare_index_path(@project.namespace, @project, from: @repository.root_ref, to: current_ref) do
Compare Compare
......
.gray-content-block.top-block.append-bottom-default .gray-content-block.append-bottom-default
.tree-ref-holder .tree-ref-holder
= render partial: 'shared/ref_switcher', locals: {destination: 'graph'} = render partial: 'shared/ref_switcher', locals: {destination: 'graph'}
......
- page_title "Network", @ref - page_title "Network", @ref
= header_title project_title(@project, "Network", namespace_project_network_path(@project.namespace, @project, current_ref)) = render "projects/commits/header_title"
= render "projects/commits/head"
= render "head" = render "head"
.project-network .project-network
.controls .controls
......
...@@ -20,11 +20,6 @@ Feature: Project Active Tab ...@@ -20,11 +20,6 @@ Feature: Project Active Tab
Then the active main tab should be Commits Then the active main tab should be Commits
And no other main tabs should be active And no other main tabs should be active
Scenario: On Project Network
Given I visit my project's network page
Then the active main tab should be Network
And no other main tabs should be active
Scenario: On Project Issues Scenario: On Project Issues
Given I visit my project's issues page Given I visit my project's issues page
Then the active main tab should be Issues Then the active main tab should be Issues
...@@ -83,6 +78,12 @@ Feature: Project Active Tab ...@@ -83,6 +78,12 @@ Feature: Project Active Tab
And no other sub tabs should be active And no other sub tabs should be active
And the active main tab should be Commits And the active main tab should be Commits
Scenario: On Project Commits/Network
Given I visit my project's network page
Then the active sub tab should be Network
And no other sub tabs should be active
And the active main tab should be Commits
Scenario: On Project Commits/Compare Scenario: On Project Commits/Compare
Given I visit my project's commits page Given I visit my project's commits page
And I click the "Compare" tab And I click the "Compare" tab
......
...@@ -67,6 +67,10 @@ class Spinach::Features::ProjectActiveTab < Spinach::FeatureSteps ...@@ -67,6 +67,10 @@ class Spinach::Features::ProjectActiveTab < Spinach::FeatureSteps
ensure_active_sub_tab('Commits') ensure_active_sub_tab('Commits')
end end
step 'the active sub tab should be Network' do
ensure_active_sub_tab('Network')
end
step 'the active sub tab should be Compare' do step 'the active sub tab should be Compare' do
ensure_active_sub_tab('Compare') ensure_active_sub_tab('Compare')
end end
......
...@@ -16,10 +16,6 @@ module SharedProjectTab ...@@ -16,10 +16,6 @@ module SharedProjectTab
ensure_active_main_tab('Commits') ensure_active_main_tab('Commits')
end end
step 'the active main tab should be Network' do
ensure_active_main_tab('Network')
end
step 'the active main tab should be Graphs' do step 'the active main tab should be Graphs' do
ensure_active_main_tab('Graphs') ensure_active_main_tab('Graphs')
end end
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment