Move Network page from separate tab to sub tab of Commits
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
This commit is contained in:
parent
6213263d32
commit
1d250b4892
|
@ -25,6 +25,7 @@ v 8.3.0 (unreleased)
|
|||
- Add languages page to graphs
|
||||
- Block LDAP user when they are no longer found in the LDAP server
|
||||
- Improve wording on project visibility levels (Zeger-Jan van de Weg)
|
||||
- Make Network page as sub tab of Commits
|
||||
|
||||
v 8.2.3
|
||||
- Fix application settings cache not expiring after changes (Stan Hu)
|
||||
|
|
|
@ -32,7 +32,7 @@
|
|||
Files
|
||||
|
||||
- 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
|
||||
= icon('history fw')
|
||||
%span
|
||||
|
@ -46,13 +46,6 @@
|
|||
Builds
|
||||
%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
|
||||
= nav_link(controller: %w(graphs)) do
|
||||
= link_to namespace_project_graph_path(@project.namespace, @project, current_ref), title: 'Graphs', class: 'shortcuts-graphs' do
|
||||
|
@ -118,3 +111,10 @@
|
|||
= icon('cogs fw')
|
||||
%span
|
||||
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 @@
|
|||
= link_to namespace_project_commits_path(@project.namespace, @project, current_ref) do
|
||||
Commits
|
||||
%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
|
||||
= link_to namespace_project_compare_index_path(@project.namespace, @project, from: @repository.root_ref, to: current_ref) do
|
||||
Compare
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
.gray-content-block.top-block.append-bottom-default
|
||||
.gray-content-block.append-bottom-default
|
||||
.tree-ref-holder
|
||||
= render partial: 'shared/ref_switcher', locals: {destination: 'graph'}
|
||||
|
||||
|
|
|
@ -1,5 +1,6 @@
|
|||
- 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"
|
||||
.project-network
|
||||
.controls
|
||||
|
|
|
@ -20,11 +20,6 @@ Feature: Project Active Tab
|
|||
Then the active main tab should be Commits
|
||||
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
|
||||
Given I visit my project's issues page
|
||||
Then the active main tab should be Issues
|
||||
|
@ -83,6 +78,12 @@ Feature: Project Active Tab
|
|||
And no other sub tabs should be active
|
||||
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
|
||||
Given I visit my project's commits page
|
||||
And I click the "Compare" tab
|
||||
|
|
|
@ -67,6 +67,10 @@ class Spinach::Features::ProjectActiveTab < Spinach::FeatureSteps
|
|||
ensure_active_sub_tab('Commits')
|
||||
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
|
||||
ensure_active_sub_tab('Compare')
|
||||
end
|
||||
|
|
|
@ -16,10 +16,6 @@ module SharedProjectTab
|
|||
ensure_active_main_tab('Commits')
|
||||
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
|
||||
ensure_active_main_tab('Graphs')
|
||||
end
|
||||
|
|
Loading…
Reference in New Issue