Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
gitlab-ce
Commits
9ccef9a7
Commit
9ccef9a7
authored
Sep 02, 2014
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'project-tab' into 'master'
Rename Activity to Project tab Fixes #1544 See merge request !1058
parents
6438ac72
a2b6c1e6
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
app/views/layouts/nav/_project.html.haml
app/views/layouts/nav/_project.html.haml
+1
-1
features/steps/shared/project_tab.rb
features/steps/shared/project_tab.rb
+1
-1
No files found.
app/views/layouts/nav/_project.html.haml
View file @
9ccef9a7
%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'
...
...
features/steps/shared/project_tab.rb
View file @
9ccef9a7
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment