Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
fa8219e0
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 搜索 >>
提交
fa8219e0
编写于
3月 22, 2012
作者:
D
Dmitriy Zaporozhets
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
better MR list, dashboard pollished
上级
81da8e46
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
13 addition
and
11 deletion
+13
-11
app/views/dashboard/index.html.haml
app/views/dashboard/index.html.haml
+4
-4
app/views/merge_requests/_merge_request.html.haml
app/views/merge_requests/_merge_request.html.haml
+9
-7
未找到文件。
app/views/dashboard/index.html.haml
浏览文件 @
fa8219e0
...
...
@@ -20,8 +20,8 @@
.row
.dashboard_block
.row
.span4
%div
.
prettyprint
.ipadded
.span4
.right
%div
.
borders
.ipadded
%h1
=
pluralize
current_user
.
projects
.
count
,
"project"
,
"projects"
-
if
current_user
.
can_create_project?
...
...
@@ -34,9 +34,9 @@
%br
=
link_to
new_project_path
,
:class
=>
"btn"
do
New Project »
.span10.
righ
t
=
render
"dashboard/projects_feed"
,
:projects
=>
@active_projects
.span10.
lef
t
=
render
"dashboard/projects_feed"
,
:projects
=>
@active_projects
-
if
@last_push
.
ui-box.
padded.prepend-top-20
.padded.prepend-top-20
%h5
%small
Latest push was to the
#{
@last_push
.
branch_name
}
branch of
#{
@last_push
.
project
.
name
}
:
%ul
.unstyled
=
render
@last_push
...
...
app/views/merge_requests/_merge_request.html.haml
浏览文件 @
fa8219e0
%li
.wll
.right
.left
-
if
merge_request
.
notes
.
any?
%span
.btn.small.disabled.padded
=
pluralize
merge_request
.
notes
.
count
,
'note'
%span
.btn.small.disabled.padded
=
merge_request
.
source_branch
→
=
merge_request
.
target_branch
=
image_tag
gravatar_icon
(
merge_request
.
author_email
),
:class
=>
"avatar"
%span
.update-author
%strong
=
merge_request
.
author_name
authored
=
time_ago_in_words
(
merge_request
.
created_at
)
ago
-
if
merge_request
.
notes
.
any?
%span
.pretty_label
=
pluralize
merge_request
.
notes
.
count
,
'note'
-
if
merge_request
.
upvotes
>
0
%span
.label.success
=
"+
#{
merge_request
.
upvotes
}
"
.right
%span
.label
=
merge_request
.
source_branch
→
%span
.label
=
merge_request
.
target_branch
=
link_to
project_merge_request_path
(
merge_request
.
project
,
merge_request
)
do
%p
.row_title
=
truncate
(
merge_request
.
title
,
:length
=>
10
0
)
%p
.row_title
=
truncate
(
merge_request
.
title
,
:length
=>
8
0
)
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录