Merge branch 'dz-code-tab'
See merge request https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4431
This commit is contained in:
commit
3f4ac2ff60
|
@ -32,6 +32,7 @@ v 8.9.0 (unreleased)
|
|||
- Cache project build count in sidebar nav
|
||||
- Reduce number of queries needed to render issue labels in the sidebar
|
||||
- Improve error handling importing projects
|
||||
- Put project Files and Commits tabs under Code tab
|
||||
|
||||
v 8.8.3
|
||||
- Fix 404 page when viewing TODOs that contain milestones or labels in different projects. !4312
|
||||
|
|
|
@ -50,7 +50,7 @@ class Projects::BranchesController < Projects::ApplicationController
|
|||
redirect_to namespace_project_branches_path(@project.namespace,
|
||||
@project), status: 303
|
||||
end
|
||||
format.js { render status: status[:return_code] }
|
||||
format.js { render nothing: true, status: status[:return_code] }
|
||||
end
|
||||
end
|
||||
|
||||
|
|
|
@ -33,18 +33,11 @@
|
|||
%span
|
||||
Activity
|
||||
- if project_nav_tab? :files
|
||||
= nav_link(controller: %w(tree blob blame edit_tree new_tree find_file)) do
|
||||
= nav_link(controller: %w(tree blob blame edit_tree new_tree find_file commit commits compare repositories tags branches releases network)) do
|
||||
= link_to project_files_path(@project), title: 'Files', class: 'shortcuts-tree' do
|
||||
= icon('files-o fw')
|
||||
= icon('code fw')
|
||||
%span
|
||||
Files
|
||||
|
||||
- if project_nav_tab? :commits
|
||||
= 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
|
||||
Commits
|
||||
Code
|
||||
|
||||
- if project_nav_tab? :pipelines
|
||||
= nav_link(controller: :pipelines) do
|
||||
|
@ -129,4 +122,10 @@
|
|||
= link_to project_builds_path(@project), title: 'Builds', class: 'shortcuts-builds' do
|
||||
Builds
|
||||
|
||||
-# Shortcut to commits page
|
||||
- if project_nav_tab? :commits
|
||||
%li.hidden
|
||||
= link_to project_commits_path(@project), title: 'Commits', class: 'shortcuts-commits' do
|
||||
Commits
|
||||
|
||||
.fade-right
|
||||
|
|
|
@ -1 +0,0 @@
|
|||
$('.js-totalbranch-count').html("#{@repository.branch_count}")
|
|
@ -1,9 +1,11 @@
|
|||
%ul.nav-links
|
||||
= nav_link(controller: %w(tree blob blame edit_tree new_tree find_file)) do
|
||||
= link_to project_files_path(@project) do
|
||||
Files
|
||||
|
||||
= nav_link(controller: [:commit, :commits]) do
|
||||
= link_to namespace_project_commits_path(@project.namespace, @project, current_ref) do
|
||||
Commits
|
||||
%span.badge
|
||||
= number_with_delimiter(@repository.commit_count)
|
||||
|
||||
= nav_link(controller: %w(network)) do
|
||||
= link_to namespace_project_network_path(@project.namespace, @project, current_ref) do
|
||||
|
@ -16,9 +18,7 @@
|
|||
= nav_link(html_options: {class: branches_tab_class}) do
|
||||
= link_to namespace_project_branches_path(@project.namespace, @project) do
|
||||
Branches
|
||||
%span.badge.js-totalbranch-count= @repository.branch_count
|
||||
|
||||
= nav_link(controller: [:tags, :releases]) do
|
||||
= link_to namespace_project_tags_path(@project.namespace, @project) do
|
||||
Tags
|
||||
%span.badge.js-totaltags-count= @repository.tag_count
|
||||
|
|
|
@ -1,3 +1,2 @@
|
|||
$('.js-totaltags-count').html("#{@repository.tags.size}");
|
||||
- if @repository.tags.empty?
|
||||
$('.tags').load(document.URL + ' .nothing-here-block').hide().fadeIn(1000)
|
||||
|
|
|
@ -3,6 +3,7 @@
|
|||
- if current_user
|
||||
= auto_discovery_link_tag(:atom, namespace_project_commits_url(@project.namespace, @project, @ref, format: :atom, private_token: current_user.private_token), title: "#{@project.name}:#{@ref} commits")
|
||||
= render 'projects/last_push'
|
||||
= render "projects/commits/head"
|
||||
|
||||
.tree-controls
|
||||
= render 'projects/find_file_link'
|
||||
|
|
|
@ -10,14 +10,9 @@ Feature: Project Active Tab
|
|||
Then the active main tab should be Home
|
||||
And no other main tabs should be active
|
||||
|
||||
Scenario: On Project Files
|
||||
Scenario: On Project Code
|
||||
Given I visit my project's files page
|
||||
Then the active main tab should be Files
|
||||
And no other main tabs should be active
|
||||
|
||||
Scenario: On Project Commits
|
||||
Given I visit my project's commits page
|
||||
Then the active main tab should be Commits
|
||||
Then the active main tab should be Code
|
||||
And no other main tabs should be active
|
||||
|
||||
Scenario: On Project Issues
|
||||
|
@ -64,40 +59,46 @@ Feature: Project Active Tab
|
|||
And no other sub navs should be active
|
||||
And the active main tab should be Settings
|
||||
|
||||
# Sub Tabs: Commits
|
||||
# Sub Tabs: Code
|
||||
|
||||
Scenario: On Project Commits/Commits
|
||||
Scenario: On Project Code/Files
|
||||
Given I visit my project's files page
|
||||
Then the active sub tab should be Files
|
||||
And no other sub tabs should be active
|
||||
And the active main tab should be Code
|
||||
|
||||
Scenario: On Project Code/Commits
|
||||
Given I visit my project's commits page
|
||||
Then the active sub tab should be Commits
|
||||
And no other sub tabs should be active
|
||||
And the active main tab should be Commits
|
||||
And the active main tab should be Code
|
||||
|
||||
Scenario: On Project Commits/Network
|
||||
Scenario: On Project Code/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
|
||||
And the active main tab should be Code
|
||||
|
||||
Scenario: On Project Commits/Compare
|
||||
Scenario: On Project Code/Compare
|
||||
Given I visit my project's commits page
|
||||
And I click the "Compare" tab
|
||||
Then the active sub tab should be Compare
|
||||
And no other sub tabs should be active
|
||||
And the active main tab should be Commits
|
||||
And the active main tab should be Code
|
||||
|
||||
Scenario: On Project Commits/Branches
|
||||
Scenario: On Project Code/Branches
|
||||
Given I visit my project's commits page
|
||||
And I click the "Branches" tab
|
||||
Then the active sub tab should be Branches
|
||||
And no other sub tabs should be active
|
||||
And the active main tab should be Commits
|
||||
And the active main tab should be Code
|
||||
|
||||
Scenario: On Project Commits/Tags
|
||||
Scenario: On Project Code/Tags
|
||||
Given I visit my project's commits page
|
||||
And I click the "Tags" tab
|
||||
Then the active sub tab should be Tags
|
||||
And no other sub tabs should be active
|
||||
And the active main tab should be Commits
|
||||
And the active main tab should be Code
|
||||
|
||||
Scenario: On Project Issues/Browse
|
||||
Given I visit my project's issues page
|
||||
|
|
|
@ -8,19 +8,21 @@ Feature: Project Shortcuts
|
|||
@javascript
|
||||
Scenario: Navigate to files tab
|
||||
Given I press "g" and "f"
|
||||
Then the active main tab should be Files
|
||||
Then the active main tab should be Code
|
||||
Then the active sub tab should be Files
|
||||
|
||||
@javascript
|
||||
Scenario: Navigate to commits tab
|
||||
Given I visit my project's files page
|
||||
Given I press "g" and "c"
|
||||
Then the active main tab should be Commits
|
||||
Then the active main tab should be Code
|
||||
Then the active sub tab should be Commits
|
||||
|
||||
@javascript
|
||||
Scenario: Navigate to network tab
|
||||
Given I press "g" and "n"
|
||||
Then the active sub tab should be Network
|
||||
And the active main tab should be Commits
|
||||
And the active main tab should be Code
|
||||
|
||||
@javascript
|
||||
Scenario: Navigate to graphs tab
|
||||
|
|
|
@ -63,10 +63,6 @@ class Spinach::Features::ProjectActiveTab < Spinach::FeatureSteps
|
|||
click_link('Tags')
|
||||
end
|
||||
|
||||
step 'the active sub tab should be Commits' do
|
||||
ensure_active_sub_tab('Commits')
|
||||
end
|
||||
|
||||
step 'the active sub tab should be Compare' do
|
||||
ensure_active_sub_tab('Compare')
|
||||
end
|
||||
|
|
|
@ -13,12 +13,12 @@ class Spinach::Features::ProjectFindFile < Spinach::FeatureSteps
|
|||
end
|
||||
|
||||
step 'I should see "find file" page' do
|
||||
ensure_active_main_tab('Files')
|
||||
ensure_active_main_tab('Code')
|
||||
expect(page).to have_selector('.file-finder-holder', count: 1)
|
||||
end
|
||||
|
||||
step 'I fill in Find by path with "git"' do
|
||||
ensure_active_main_tab('Files')
|
||||
ensure_active_main_tab('Code')
|
||||
expect(page).to have_selector('.file-finder-holder', count: 1)
|
||||
end
|
||||
|
||||
|
|
|
@ -8,12 +8,8 @@ module SharedProjectTab
|
|||
ensure_active_main_tab('Project')
|
||||
end
|
||||
|
||||
step 'the active main tab should be Files' do
|
||||
ensure_active_main_tab('Files')
|
||||
end
|
||||
|
||||
step 'the active main tab should be Commits' do
|
||||
ensure_active_main_tab('Commits')
|
||||
step 'the active main tab should be Code' do
|
||||
ensure_active_main_tab('Code')
|
||||
end
|
||||
|
||||
step 'the active main tab should be Graphs' do
|
||||
|
@ -51,4 +47,12 @@ module SharedProjectTab
|
|||
step 'the active sub tab should be Network' do
|
||||
ensure_active_sub_tab('Network')
|
||||
end
|
||||
|
||||
step 'the active sub tab should be Files' do
|
||||
ensure_active_sub_tab('Files')
|
||||
end
|
||||
|
||||
step 'the active sub tab should be Commits' do
|
||||
ensure_active_sub_tab('Commits')
|
||||
end
|
||||
end
|
||||
|
|
|
@ -122,27 +122,23 @@ describe Projects::BranchesController do
|
|||
let(:branch) { "feature" }
|
||||
|
||||
it { expect(response.status).to eq(200) }
|
||||
it { expect(subject).to render_template('destroy') }
|
||||
end
|
||||
|
||||
context "valid branch name with unencoded slashes" do
|
||||
let(:branch) { "improve/awesome" }
|
||||
|
||||
it { expect(response.status).to eq(200) }
|
||||
it { expect(subject).to render_template('destroy') }
|
||||
end
|
||||
|
||||
context "valid branch name with encoded slashes" do
|
||||
let(:branch) { "improve%2Fawesome" }
|
||||
|
||||
it { expect(response.status).to eq(200) }
|
||||
it { expect(subject).to render_template('destroy') }
|
||||
end
|
||||
context "invalid branch name, valid ref" do
|
||||
let(:branch) { "no-branch" }
|
||||
|
||||
it { expect(response.status).to eq(404) }
|
||||
it { expect(subject).to render_template('destroy') }
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
Loading…
Reference in New Issue