Commit 9ccef9a7 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge branch 'project-tab' into 'master'

Rename Activity to Project tab

Fixes #1544

See merge request !1058
parents 6438ac72 a2b6c1e6
%ul.project-navigation %ul.project-navigation
= nav_link(path: 'projects#show', html_options: {class: "home"}) do = nav_link(path: 'projects#show', html_options: {class: "home"}) do
= link_to project_path(@project), title: 'Project', class: 'shortcuts-activity' do = link_to project_path(@project), title: 'Project', class: 'shortcuts-activity' do
Activity Project
- if project_nav_tab? :files - if project_nav_tab? :files
= nav_link(controller: %w(tree blob blame edit_tree new_tree)) do = nav_link(controller: %w(tree blob blame edit_tree new_tree)) do
= link_to 'Files', project_tree_path(@project, @ref || @repository.root_ref), class: 'shortcuts-tree' = link_to 'Files', project_tree_path(@project, @ref || @repository.root_ref), class: 'shortcuts-tree'
......
...@@ -3,7 +3,7 @@ module SharedProjectTab ...@@ -3,7 +3,7 @@ module SharedProjectTab
include SharedActiveTab include SharedActiveTab
step 'the active main tab should be Home' do step 'the active main tab should be Home' do
ensure_active_main_tab('Activity') ensure_active_main_tab('Project')
end end
step 'the active main tab should be Files' do step 'the active main tab should be Files' 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