Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
5ef3b384
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,发现更多精彩内容 >>
提交
5ef3b384
编写于
4月 17, 2012
作者:
D
Dmitriy Zaporozhets
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
MR commits suppressed if too many. few icons
上级
3b7998e1
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
29 addition
and
5 deletion
+29
-5
app/assets/javascripts/merge_requests.js
app/assets/javascripts/merge_requests.js
+6
-0
app/views/merge_requests/_commits.html.haml
app/views/merge_requests/_commits.html.haml
+17
-4
app/views/projects/_project_head.html.haml
app/views/projects/_project_head.html.haml
+3
-0
app/views/projects/show.html.haml
app/views/projects/show.html.haml
+3
-1
未找到文件。
app/assets/javascripts/merge_requests.js
浏览文件 @
5ef3b384
...
@@ -38,5 +38,11 @@ var MergeRequest = {
...
@@ -38,5 +38,11 @@ var MergeRequest = {
$
(
'
.status
'
).
removeClass
(
"
loading
"
);
$
(
'
.status
'
).
removeClass
(
"
loading
"
);
},
},
dataType
:
"
script
"
});
dataType
:
"
script
"
});
},
showAllCommits
:
function
()
{
$
(
"
.first_mr_commits
"
).
remove
();
$
(
"
.all_mr_commits
"
).
removeClass
(
"
hide
"
);
}
}
}
}
app/views/merge_requests/_commits.html.haml
浏览文件 @
5ef3b384
-
unless
@commits
.
empty?
-
unless
@commits
.
empty?
.ui-box
.ui-box
%h5
Commits
%h5
Commits
(
#{
@commits
.
count
}
)
.merge-request-commits
.merge-request-commits
%ul
.unstyled
-
if
@commits
.
count
>
8
-
@commits
.
each
do
|
commit
|
%ul
.first_mr_commits.unstyled
=
render
"commits/commit"
,
:commit
=>
commit
-
@commits
.
first
(
8
).
each
do
|
commit
|
=
render
"commits/commit"
,
:commit
=>
commit
%li
.bottom
8 of
#{
@commits
.
count
}
commits displayed.
%strong
=
link_to_function
"Click here to show all"
,
"MergeRequest.showAllCommits()"
%ul
.all_mr_commits.hide.unstyled
-
@commits
.
each
do
|
commit
|
=
render
"commits/commit"
,
:commit
=>
commit
-
else
%ul
.unstyled
-
@commits
.
each
do
|
commit
|
=
render
"commits/commit"
,
:commit
=>
commit
-
else
-
else
%h5
%h5
...
...
app/views/projects/_project_head.html.haml
浏览文件 @
5ef3b384
%ul
.nav.nav-tabs
%ul
.nav.nav-tabs
%li
{
:class
=>
"#{'active' if current_page?(project_path(@project)) }"
}
%li
{
:class
=>
"#{'active' if current_page?(project_path(@project)) }"
}
=
link_to
project_path
(
@project
),
:class
=>
"activities-tab tab"
do
=
link_to
project_path
(
@project
),
:class
=>
"activities-tab tab"
do
%i
.icon-home
Show
Show
%li
{
:class
=>
" #{'active' if (controller.controller_name == "
team_members
") || current_page?(team_project_path(@project)) }"
}
%li
{
:class
=>
" #{'active' if (controller.controller_name == "
team_members
") || current_page?(team_project_path(@project)) }"
}
=
link_to
team_project_path
(
@project
),
:class
=>
"team-tab tab"
do
=
link_to
team_project_path
(
@project
),
:class
=>
"team-tab tab"
do
%i
.icon-user
Team
Team
%li
{
:class
=>
"#{'active' if current_page?(files_project_path(@project)) }"
}
%li
{
:class
=>
"#{'active' if current_page?(files_project_path(@project)) }"
}
=
link_to
files_project_path
(
@project
),
:class
=>
"files-tab tab "
do
=
link_to
files_project_path
(
@project
),
:class
=>
"files-tab tab "
do
...
@@ -23,5 +25,6 @@
...
@@ -23,5 +25,6 @@
Hooks
Hooks
%li
.right
{
:class
=>
"#{'active' if current_page?(edit_project_path(@project)) }"
}
%li
.right
{
:class
=>
"#{'active' if current_page?(edit_project_path(@project)) }"
}
=
link_to
edit_project_path
(
@project
),
:class
=>
"stat-tab tab "
do
=
link_to
edit_project_path
(
@project
),
:class
=>
"stat-tab tab "
do
%i
.icon-edit
Edit
Edit
app/views/projects/show.html.haml
浏览文件 @
5ef3b384
...
@@ -14,7 +14,9 @@
...
@@ -14,7 +14,9 @@
.span4.right
.span4.right
.right
.right
-
if
can?
current_user
,
:download_code
,
@project
-
if
can?
current_user
,
:download_code
,
@project
=
link_to
"Download"
,
archive_project_repository_path
(
@project
),
:class
=>
"btn small padded"
=
link_to
archive_project_repository_path
(
@project
),
:class
=>
"btn small padded"
do
%i
.icon-download-alt
Download
-
if
@project
.
merge_requests_enabled
&&
can?
(
current_user
,
:write_merge_request
,
@project
)
-
if
@project
.
merge_requests_enabled
&&
can?
(
current_user
,
:write_merge_request
,
@project
)
=
link_to
new_project_merge_request_path
(
@project
),
:title
=>
"New Merge Request"
,
:class
=>
"btn small padded"
do
=
link_to
new_project_merge_request_path
(
@project
),
:title
=>
"New Merge Request"
,
:class
=>
"btn small padded"
do
Merge Request
Merge Request
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录