Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
78a64ca1
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,发现更多精彩内容 >>
提交
78a64ca1
编写于
10月 27, 2012
作者:
D
Dmitriy Zaporozhets
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #1851 from riyad/link-to-commit-authors-everywhere
Link to commit authors everywhere
上级
ca524d8d
646bad43
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
55 addition
and
24 deletion
+55
-24
app/assets/stylesheets/sections/commits.scss
app/assets/stylesheets/sections/commits.scss
+8
-2
app/assets/stylesheets/sections/tree.scss
app/assets/stylesheets/sections/tree.scss
+9
-0
app/decorators/commit_decorator.rb
app/decorators/commit_decorator.rb
+34
-14
app/views/blame/show.html.haml
app/views/blame/show.html.haml
+1
-3
app/views/commits/_commit.html.haml
app/views/commits/_commit.html.haml
+1
-2
app/views/commits/_commit_box.html.haml
app/views/commits/_commit_box.html.haml
+2
-3
未找到文件。
app/assets/stylesheets/sections/commits.scss
浏览文件 @
78a64ca1
...
...
@@ -47,12 +47,15 @@
padding-left
:
32px
;
}
.author
,
.committer
{
.author
a
,
.committer
a
{
font-size
:
14px
;
line-height
:
22px
;
text-shadow
:
0
1px
1px
#fff
;
color
:
#777
;
&
:hover
{
color
:
#999
;
}
}
.avatar
{
...
...
@@ -227,6 +230,9 @@
.commit-author-name
{
color
:
#777
;
&
:hover
{
color
:
#999
;
}
}
}
...
...
app/assets/stylesheets/sections/tree.scss
浏览文件 @
78a64ca1
...
...
@@ -72,6 +72,15 @@
}
}
}
.blame
{
img
.avatar
{
border
:
0
none
;
float
:
none
;
margin
:
0
;
padding
:
0
;
}
}
}
.tree-btn-group
{
...
...
app/decorators/commit_decorator.rb
浏览文件 @
78a64ca1
...
...
@@ -47,21 +47,15 @@ class CommitDecorator < ApplicationDecorator
# Otherwise it will link to the author email as specified in the commit.
#
# options:
# avatar: true will prepend avatar image
def
author_link
(
options
)
text
=
if
options
[
:avatar
]
avatar
=
h
.
image_tag
h
.
gravatar_icon
(
author_email
),
class:
"avatar s16"
,
width:
16
"
#{
avatar
}
#{
author_name
}
"
else
author_name
end
team_member
=
@project
.
try
(
:team_member_by_name_or_email
,
author_name
,
author_email
)
# avatar: true will prepend the avatar image
# size: size of the avatar image in px
def
author_link
(
options
=
{})
person_link
(
options
.
merge
source: :author
)
end
if
team_member
.
nil?
h
.
mail_to
author_email
,
text
.
html_safe
,
class:
"commit-author-link"
else
h
.
link_to
text
,
h
.
project_team_member_path
(
@project
,
team_member
),
class:
"commit-author-link"
end
# Just like #author_link but for the committer.
def
committer_link
(
options
=
{})
person_link
(
options
.
merge
source: :committer
)
end
protected
...
...
@@ -69,4 +63,30 @@ class CommitDecorator < ApplicationDecorator
def
no_commit_message
"--no commit message"
end
# Private: Returns a link to a person. If the person has a matching user and
# is a member of the current @project it will link to the team member page.
# Otherwise it will link to the person email as specified in the commit.
#
# options:
# source: one of :author or :committer
# avatar: true will prepend the avatar image
# size: size of the avatar image in px
def
person_link
(
options
=
{})
source_name
=
send
"
#{
options
[
:source
]
}
_name"
.
to_sym
source_email
=
send
"
#{
options
[
:source
]
}
_email"
.
to_sym
text
=
if
options
[
:avatar
]
avatar
=
h
.
image_tag
h
.
gravatar_icon
(
source_email
,
options
[
:size
]),
class:
"avatar
#{
"s
#{
options
[
:size
]
}
"
if
options
[
:size
]
}
"
,
width:
options
[
:size
]
%Q{
#{
avatar
}
<span class="commit-
#{
options
[
:source
]
}
-name">
#{
source_name
}
</span>}
else
source_name
end
team_member
=
@project
.
try
(
:team_member_by_name_or_email
,
source_name
,
source_email
)
if
team_member
.
nil?
h
.
mail_to
source_email
,
text
.
html_safe
,
class:
"commit-
#{
options
[
:source
]
}
-link"
else
h
.
link_to
text
,
h
.
project_team_member_path
(
@project
,
team_member
),
class:
"commit-
#{
options
[
:source
]
}
-link"
end
end
end
app/views/blame/show.html.haml
浏览文件 @
78a64ca1
...
...
@@ -24,9 +24,7 @@
-
commit
=
Commit
.
new
(
commit
)
-
commit
=
CommitDecorator
.
decorate
(
commit
)
%tr
%td
.author
=
image_tag
gravatar_icon
(
commit
.
author_email
,
16
)
=
commit
.
author_name
%td
.author
=
commit
.
author_link
avatar:
true
,
size:
16
%td
.blame_commit
%code
=
link_to
commit
.
short_id
,
project_commit_path
(
@project
,
commit
)
...
...
app/views/commits/_commit.html.haml
浏览文件 @
78a64ca1
...
...
@@ -4,9 +4,8 @@
%strong
=
link_to
"Browse Code »"
,
project_tree_path
(
@project
,
commit
),
class:
"right"
%p
=
link_to
commit
.
short_id
(
8
),
project_commit_path
(
@project
,
commit
),
class:
"commit_short_id"
%strong
.commit-author-name
=
commit
.
author_name
%strong
=
commit
.
author_link
avatar:
true
,
size:
24
%span
.dash
–
=
image_tag
gravatar_icon
(
commit
.
author_email
),
class:
"avatar"
,
width:
16
=
link_to_gfm
truncate
(
commit
.
title
,
length:
50
),
project_commit_path
(
@project
,
commit
.
id
),
class:
"row_title"
%span
.committed_ago
...
...
app/views/commits/_commit_box.html.haml
浏览文件 @
78a64ca1
...
...
@@ -18,16 +18,15 @@
.commit-info
.row
.span5
=
image_tag
gravatar_icon
(
@commit
.
author_email
,
40
),
class:
"avatar"
.author
%strong
=
@commit
.
author_
name
%strong
=
@commit
.
author_
link
avatar:
true
,
size:
40
authored
%time
{
title:
@commit
.
authored_date
.
stamp
(
"Aug 21, 2011 9:23pm"
)}
#{
time_ago_in_words
(
@commit
.
authored_date
)
}
ago
-
if
@commit
.
different_committer?
.committer
→
%strong
=
@commit
.
committer_
name
%strong
=
@commit
.
committer_
link
committed
%time
{
title:
@commit
.
committed_date
.
stamp
(
"Aug 21, 2011 9:23pm"
)}
#{
time_ago_in_words
(
@commit
.
committed_date
)
}
ago
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录