Commit 15516150 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge branch 'rename-code-to-repo' into 'master'

Rename Code tab to Repository

As discussed in #18830, this renames the "Code" tab to "Repository".

Screenshot now:

![image](/uploads/a7807dfb5b42f037fe2a44475a4af883/image.png)


See merge request !4807
parents 7198b784 59fc1816
......@@ -39,9 +39,9 @@
- if project_nav_tab? :files
= 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: 'Code', class: 'shortcuts-tree' do
= link_to project_files_path(@project), title: 'Repository', class: 'shortcuts-tree' do
%span
Code
Repository
- if project_nav_tab? :pipelines
= nav_link(controller: [:pipelines, :builds, :environments]) do
......
......@@ -10,9 +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 Code
Scenario: On Project Repository
Given I visit my project's files page
Then the active main tab should be Code
Then the active main tab should be Repository
And no other main tabs should be active
Scenario: On Project Issues
......@@ -59,46 +59,46 @@ Feature: Project Active Tab
And no other sub navs should be active
And the active main tab should be Settings
# Sub Tabs: Code
# Sub Tabs: Repository
Scenario: On Project Code/Files
Scenario: On Project Repository/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
And the active main tab should be Repository
Scenario: On Project Code/Commits
Scenario: On Project Repository/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 Code
And the active main tab should be Repository
Scenario: On Project Code/Network
Scenario: On Project Repository/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 Code
And the active main tab should be Repository
Scenario: On Project Code/Compare
Scenario: On Project Repository/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 Code
And the active main tab should be Repository
Scenario: On Project Code/Branches
Scenario: On Project Repository/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 Code
And the active main tab should be Repository
Scenario: On Project Code/Tags
Scenario: On Project Repository/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 Code
And the active main tab should be Repository
Scenario: On Project Issues/Browse
Given I visit my project's issues page
......
......@@ -8,21 +8,21 @@ Feature: Project Shortcuts
@javascript
Scenario: Navigate to files tab
Given I press "g" and "f"
Then the active main tab should be Code
Then the active main tab should be Repository
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 Code
Then the active main tab should be Repository
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 Code
And the active main tab should be Repository
@javascript
Scenario: Navigate to graphs tab
......
......@@ -13,12 +13,12 @@ class Spinach::Features::ProjectFindFile < Spinach::FeatureSteps
end
step 'I should see "find file" page' do
ensure_active_main_tab('Code')
ensure_active_main_tab('Repository')
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('Code')
ensure_active_main_tab('Repository')
expect(page).to have_selector('.file-finder-holder', count: 1)
end
......
......@@ -8,8 +8,8 @@ module SharedProjectTab
ensure_active_main_tab('Project')
end
step 'the active main tab should be Code' do
ensure_active_main_tab('Code')
step 'the active main tab should be Repository' do
ensure_active_main_tab('Repository')
end
step 'the active main tab should be Graphs' do
......
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