Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
5600b17d
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,发现更多精彩内容 >>
提交
5600b17d
编写于
2月 22, 2017
作者:
A
Alfredo Sumaran
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Code style improvements
上级
5b3d143a
变更
11
隐藏空白更改
内联
并排
Showing
11 changed file
with
52 addition
and
22 deletion
+52
-22
app/views/groups/_head.html.haml
app/views/groups/_head.html.haml
+19
-0
app/views/groups/_head_issues.html.haml
app/views/groups/_head_issues.html.haml
+19
-0
app/views/groups/activity.html.haml
app/views/groups/activity.html.haml
+2
-1
app/views/groups/group_members/index.html.haml
app/views/groups/group_members/index.html.haml
+1
-0
app/views/groups/issues.html.haml
app/views/groups/issues.html.haml
+1
-0
app/views/groups/labels/index.html.haml
app/views/groups/labels/index.html.haml
+1
-0
app/views/groups/milestones/index.html.haml
app/views/groups/milestones/index.html.haml
+1
-0
app/views/groups/show.html.haml
app/views/groups/show.html.haml
+1
-0
app/views/layouts/nav/_group.html.haml
app/views/layouts/nav/_group.html.haml
+2
-18
changelogs/unreleased/26348-cleanup-navigation-order-groups.yml
...logs/unreleased/26348-cleanup-navigation-order-groups.yml
+4
-0
features/steps/group/milestones.rb
features/steps/group/milestones.rb
+1
-3
未找到文件。
app/views/groups/_head.html.haml
0 → 100644
浏览文件 @
5600b17d
=
content_for
:sub_nav
do
.scrolling-tabs-container.sub-nav-scroll
=
render
'shared/nav_scroll'
.nav-links.sub-nav.scrolling-tabs
%ul
{
class:
container_class
}
=
nav_link
(
path:
'groups#show'
,
html_options:
{
class:
'home'
})
do
=
link_to
group_path
(
@group
),
title:
'Group Home'
do
%span
Home
=
nav_link
(
path:
'groups#activity'
)
do
=
link_to
activity_group_path
(
@group
),
title:
'Activity'
do
%span
Activity
=
nav_link
(
path:
'group_members#index'
)
do
=
link_to
group_group_members_path
(
@group
),
title:
'Members'
do
%span
Members
app/views/groups/_head_issues.html.haml
0 → 100644
浏览文件 @
5600b17d
=
content_for
:sub_nav
do
.scrolling-tabs-container.sub-nav-scroll
=
render
'shared/nav_scroll'
.nav-links.sub-nav.scrolling-tabs
%ul
{
class:
container_class
}
=
nav_link
(
path:
'groups#issues'
,
html_options:
{
class:
'home'
})
do
=
link_to
issues_group_path
(
@group
),
title:
'List'
do
%span
List
=
nav_link
(
path:
'labels#index'
)
do
=
link_to
group_labels_path
(
@group
),
title:
'Labels'
do
%span
Labels
=
nav_link
(
path:
'milestones#index'
)
do
=
link_to
group_milestones_path
(
@group
),
title:
'Milestones'
do
%span
Milestones
app/views/groups/activity.html.haml
浏览文件 @
5600b17d
...
@@ -2,7 +2,8 @@
...
@@ -2,7 +2,8 @@
-
if
current_user
-
if
current_user
=
auto_discovery_link_tag
(
:atom
,
group_url
(
@group
,
format: :atom
,
private_token:
current_user
.
private_token
),
title:
"
#{
@group
.
name
}
activity"
)
=
auto_discovery_link_tag
(
:atom
,
group_url
(
@group
,
format: :atom
,
private_token:
current_user
.
private_token
),
title:
"
#{
@group
.
name
}
activity"
)
-
page_title
"Activity"
-
page_title
"Activity"
=
render
'groups/head'
%section
.activities
%section
.activities
=
render
'activities'
=
render
'activities'
app/views/groups/group_members/index.html.haml
浏览文件 @
5600b17d
-
page_title
"Members"
-
page_title
"Members"
=
render
'groups/head'
.project-members-page.prepend-top-default
.project-members-page.prepend-top-default
%h4
%h4
...
...
app/views/groups/issues.html.haml
浏览文件 @
5600b17d
-
page_title
"Issues"
-
page_title
"Issues"
=
render
"head_issues"
=
content_for
:meta_tags
do
=
content_for
:meta_tags
do
-
if
current_user
-
if
current_user
=
auto_discovery_link_tag
(
:atom
,
url_for
(
params
.
merge
(
format: :atom
,
private_token:
current_user
.
private_token
)),
title:
"
#{
@group
.
name
}
issues"
)
=
auto_discovery_link_tag
(
:atom
,
url_for
(
params
.
merge
(
format: :atom
,
private_token:
current_user
.
private_token
)),
title:
"
#{
@group
.
name
}
issues"
)
...
...
app/views/groups/labels/index.html.haml
浏览文件 @
5600b17d
-
page_title
'Labels'
-
page_title
'Labels'
=
render
"groups/head_issues"
.top-area.adjust
.top-area.adjust
.nav-text
.nav-text
...
...
app/views/groups/milestones/index.html.haml
浏览文件 @
5600b17d
-
page_title
"Milestones"
-
page_title
"Milestones"
=
render
"groups/head_issues"
.top-area
.top-area
=
render
'shared/milestones_filter'
=
render
'shared/milestones_filter'
...
...
app/views/groups/show.html.haml
浏览文件 @
5600b17d
...
@@ -4,6 +4,7 @@
...
@@ -4,6 +4,7 @@
-
if
current_user
-
if
current_user
=
auto_discovery_link_tag
(
:atom
,
group_url
(
@group
,
format: :atom
,
private_token:
current_user
.
private_token
),
title:
"
#{
@group
.
name
}
activity"
)
=
auto_discovery_link_tag
(
:atom
,
group_url
(
@group
,
format: :atom
,
private_token:
current_user
.
private_token
),
title:
"
#{
@group
.
name
}
activity"
)
=
render
'groups/head'
=
render
'groups/home_panel'
=
render
'groups/home_panel'
...
...
app/views/layouts/nav/_group.html.haml
浏览文件 @
5600b17d
...
@@ -5,23 +5,11 @@
...
@@ -5,23 +5,11 @@
.fade-right
.fade-right
=
icon
(
'angle-right'
)
=
icon
(
'angle-right'
)
%ul
.nav-links.scrolling-tabs
%ul
.nav-links.scrolling-tabs
=
nav_link
(
path:
'groups#show'
,
html_options:
{
class:
'home'
})
do
=
nav_link
(
path:
[
'groups#show'
,
'groups#activity'
,
'group_members#index'
],
html_options:
{
class:
'home'
})
do
=
link_to
group_path
(
@group
),
title:
'Home'
do
=
link_to
group_path
(
@group
),
title:
'Home'
do
%span
%span
Group
Group
=
nav_link
(
path:
'groups#activity'
)
do
=
nav_link
(
path:
[
'groups#issues'
,
'labels#index'
,
'milestones#index'
])
do
=
link_to
activity_group_path
(
@group
),
title:
'Activity'
do
%span
Activity
=
nav_link
(
controller:
[
:group
,
:labels
])
do
=
link_to
group_labels_path
(
@group
),
title:
'Labels'
do
%span
Labels
=
nav_link
(
controller:
[
:group
,
:milestones
])
do
=
link_to
group_milestones_path
(
@group
),
title:
'Milestones'
do
%span
Milestones
=
nav_link
(
path:
'groups#issues'
)
do
=
link_to
issues_group_path
(
@group
),
title:
'Issues'
do
=
link_to
issues_group_path
(
@group
),
title:
'Issues'
do
%span
%span
Issues
Issues
...
@@ -33,7 +21,3 @@
...
@@ -33,7 +21,3 @@
Merge Requests
Merge Requests
-
merge_requests
=
MergeRequestsFinder
.
new
(
current_user
,
group_id:
@group
.
id
,
state:
'opened'
,
non_archived:
true
).
execute
-
merge_requests
=
MergeRequestsFinder
.
new
(
current_user
,
group_id:
@group
.
id
,
state:
'opened'
,
non_archived:
true
).
execute
%span
.badge.count
=
number_with_delimiter
(
merge_requests
.
count
)
%span
.badge.count
=
number_with_delimiter
(
merge_requests
.
count
)
=
nav_link
(
controller:
[
:group_members
])
do
=
link_to
group_group_members_path
(
@group
),
title:
'Members'
do
%span
Members
changelogs/unreleased/26348-cleanup-navigation-order-groups.yml
0 → 100644
浏览文件 @
5600b17d
---
title
:
Clean-up Groups navigation order
merge_request
:
9309
author
:
features/steps/group/milestones.rb
浏览文件 @
5600b17d
...
@@ -5,9 +5,7 @@ class Spinach::Features::GroupMilestones < Spinach::FeatureSteps
...
@@ -5,9 +5,7 @@ class Spinach::Features::GroupMilestones < Spinach::FeatureSteps
include
SharedUser
include
SharedUser
step
'I click on group milestones'
do
step
'I click on group milestones'
do
page
.
within
(
'.layout-nav'
)
do
visit
group_milestones_path
(
'owned'
)
click_link
'Milestones'
end
end
end
step
'I should see group milestones index page has no milestones'
do
step
'I should see group milestones index page has no milestones'
do
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录