Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
fafc34b0
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,发现更多精彩内容 >>
提交
fafc34b0
编写于
3月 21, 2012
作者:
S
Steven Verbeek
浏览文件
操作
浏览文件
下载
差异文件
merging upstream changes
上级
35d0de8f
b57faf92
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
22 addition
and
10 deletion
+22
-10
app/assets/stylesheets/common.scss
app/assets/stylesheets/common.scss
+2
-4
app/views/events/_commit.html.haml
app/views/events/_commit.html.haml
+9
-0
app/views/events/_event_changed_merge_request.html.haml
app/views/events/_event_changed_merge_request.html.haml
+1
-0
app/views/events/_event_new_merge_request.html.haml
app/views/events/_event_new_merge_request.html.haml
+1
-0
app/views/events/_event_push.html.haml
app/views/events/_event_push.html.haml
+9
-6
未找到文件。
app/assets/stylesheets/common.scss
浏览文件 @
fafc34b0
...
...
@@ -875,7 +875,7 @@ p.time {
.event_feed
{
min-height
:
40px
;
border-bottom
:
1px
solid
#
eee
;
border-bottom
:
1px
solid
#
ddd
;
.avatar
{
width
:
32px
;
}
...
...
@@ -887,9 +887,7 @@ p.time {
}
}
padding
:
10px
5px
;
border-bottom
:
1px
solid
#eee
;
border-bottom
:
1px
solid
rgba
(
0
,
0
,
0
,
0
.05
);
padding
:
15px
5px
;
&
:last-child
{
border
:none
}
.wll
:hover
{
background
:none
}
}
...
...
app/views/events/_commit.html.haml
0 → 100644
浏览文件 @
fafc34b0
%li
.wll.commit
=
link_to
project_commit_path
(
project
,
:id
=>
commit
.
id
)
do
%p
%code
.left
=
commit
.
id
.
to_s
[
0
..
10
]
%strong
.cgray
=
commit
.
author_name
–
=
image_tag
gravatar_icon
(
commit
.
author_email
),
:class
=>
"avatar"
,
:width
=>
16
%span
.row_title
=
truncate
(
commit
.
safe_message
,
:length
=>
50
)
rescue
"--broken encoding"
app/views/events/_event_changed_merge_request.html.haml
浏览文件 @
fafc34b0
...
...
@@ -13,6 +13,7 @@ at
%span
.cgray
=
time_ago_in_words
(
event
.
created_at
)
ago.
%br
%span
.label
=
event
.
merge_request
.
source_branch
→
%span
.label
=
event
.
merge_request
.
target_branch
...
...
app/views/events/_event_new_merge_request.html.haml
浏览文件 @
fafc34b0
...
...
@@ -9,6 +9,7 @@ at
%span
.cgray
=
time_ago_in_words
(
event
.
created_at
)
ago.
%br
%span
.label
=
event
.
merge_request
.
source_branch
→
%span
.label
=
event
.
merge_request
.
target_branch
...
...
app/views/events/_event_push.html.haml
浏览文件 @
fafc34b0
...
...
@@ -30,13 +30,16 @@
ago.
-
if
event
.
commits
.
count
>
1
=
link_to
compare_project_commits_path
(
event
.
project
,
:from
=>
event
.
commits
.
first
.
prev_commit_id
,
:to
=>
event
.
commits
.
last
.
id
)
do
Compare
#{
event
.
commits
.
first
.
commit
.
id
[
0
..
8
]
}
...
#{
event
.
commits
.
last
.
id
[
0
..
8
]
}
-
@
project
=
event
.
project
%strong
#{
event
.
commits
.
first
.
commit
.
id
[
0
..
7
]
}
...
#{
event
.
commits
.
last
.
id
[
0
..
7
]
}
-
project
=
event
.
project
%ul
.unstyled.event_commits
-
if
event
.
commits
.
size
>
3
=
render
event
.
commits
[
0
...
2
]
%li
... and
#{
event
.
commits
.
size
-
2
}
more commits
-
event
.
commits
[
0
...
2
].
each
do
|
commit
|
=
render
"events/commit"
,
:commit
=>
commit
,
:project
=>
project
%li
%br
\... and
#{
event
.
commits
.
size
-
2
}
more commits
-
else
=
render
event
.
commits
-
event
.
commits
.
each
do
|
commit
|
=
render
"events/commit"
,
:commit
=>
commit
,
:project
=>
project
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录