Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
1d250b48
G
gitlab-foss
项目概览
李少辉-开发者
/
gitlab-foss
通知
15
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
G
gitlab-foss
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
未验证
提交
1d250b48
编写于
12月 09, 2015
作者:
D
Dmitriy Zaporozhets
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Move Network page from separate tab to sub tab of Commits
Signed-off-by:
N
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
上级
6213263d
变更
8
隐藏空白更改
内联
并排
Showing
8 changed file
with
28 addition
and
19 deletion
+28
-19
CHANGELOG
CHANGELOG
+1
-0
app/views/layouts/nav/_project.html.haml
app/views/layouts/nav/_project.html.haml
+8
-8
app/views/projects/commits/_head.html.haml
app/views/projects/commits/_head.html.haml
+6
-0
app/views/projects/network/_head.html.haml
app/views/projects/network/_head.html.haml
+1
-1
app/views/projects/network/show.html.haml
app/views/projects/network/show.html.haml
+2
-1
features/project/active_tab.feature
features/project/active_tab.feature
+6
-5
features/steps/project/active_tab.rb
features/steps/project/active_tab.rb
+4
-0
features/steps/shared/project_tab.rb
features/steps/shared/project_tab.rb
+0
-4
未找到文件。
CHANGELOG
浏览文件 @
1d250b48
...
...
@@ -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)
...
...
app/views/layouts/nav/_project.html.haml
浏览文件 @
1d250b48
...
...
@@ -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
app/views/projects/commits/_head.html.haml
浏览文件 @
1d250b48
...
...
@@ -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
...
...
app/views/projects/network/_head.html.haml
浏览文件 @
1d250b48
.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'
}
...
...
app/views/projects/network/show.html.haml
浏览文件 @
1d250b48
-
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
...
...
features/project/active_tab.feature
浏览文件 @
1d250b48
...
...
@@ -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
...
...
features/steps/project/active_tab.rb
浏览文件 @
1d250b48
...
...
@@ -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
...
...
features/steps/shared/project_tab.rb
浏览文件 @
1d250b48
...
...
@@ -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
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录