Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
8170da06
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,发现更多精彩内容 >>
提交
8170da06
编写于
11月 06, 2011
作者:
D
Dmitriy Zaporozhets
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'dev' into gh_master
上级
121f6d04
e29a2566
变更
6
显示空白变更内容
内联
并排
Showing
6 changed file
with
47 addition
and
26 deletion
+47
-26
app/assets/stylesheets/projects.css.scss
app/assets/stylesheets/projects.css.scss
+9
-0
app/helpers/application_helper.rb
app/helpers/application_helper.rb
+4
-0
app/models/project.rb
app/models/project.rb
+5
-0
app/views/commits/_commits.html.haml
app/views/commits/_commits.html.haml
+1
-1
app/views/layouts/project.html.haml
app/views/layouts/project.html.haml
+23
-23
app/views/projects/_tree_item.html.haml
app/views/projects/_tree_item.html.haml
+5
-2
未找到文件。
app/assets/stylesheets/projects.css.scss
浏览文件 @
8170da06
...
...
@@ -667,6 +667,15 @@ table.highlighttable pre{
.cred
{
color
:
#D12F19
;
}
.cgreen
{
color
:
#44aa22
;
}
body
.project-page
table
.commit
{
a
.tree-commit-link
{
color
:gray
;
&
:hover
{
text-decoration
:underline
;
}
}
}
body
.project-page
#notes-list
.note
{
padding
:
10px
;
border-bottom
:
1px
solid
#eee
;
overflow
:
hidden
;
display
:
block
;}
body
.project-page
#notes-list
.note
{
padding
:
10px
;
border-bottom
:
1px
solid
#eee
;
overflow
:
hidden
;
display
:
block
;}
body
.project-page
#notes-list
.note
img
{
float
:
left
;
margin-right
:
10px
;}
...
...
app/helpers/application_helper.rb
浏览文件 @
8170da06
...
...
@@ -4,6 +4,10 @@ module ApplicationHelper
"http://www.gravatar.com/avatar/
#{
Digest
::
MD5
.
hexdigest
(
user_email
)
}
?s=40&d=identicon"
end
def
fixed_mode?
@view_mode
==
:fixed
end
def
body_class
(
default_class
=
nil
)
main
=
content_for
(
:body_class
).
blank?
?
default_class
:
...
...
app/models/project.rb
浏览文件 @
8170da06
...
...
@@ -50,6 +50,11 @@ class Project < ActiveRecord::Base
code
end
def
team_member_by_name_or_email
(
email
=
nil
,
name
=
nil
)
user
=
users
.
where
(
"email like ? or name like ?"
,
email
,
name
).
first
users_projects
.
find_by_user_id
(
user
.
id
)
if
user
end
def
common_notes
notes
.
where
(
:noteable_type
=>
[
""
,
nil
])
end
...
...
app/views/commits/_commits.html.haml
浏览文件 @
8170da06
...
...
@@ -17,7 +17,7 @@
=
image_tag
"no_avatar.png"
,
:class
=>
"left"
,
:width
=>
40
,
:style
=>
"padding-right:5px;"
%span
.commit-title
%strong
=
truncate
(
commit
.
safe_message
,
:length
=>
6
0
)
=
truncate
(
commit
.
safe_message
,
:length
=>
fixed_mode?
?
60
:
12
0
)
%span
.commit-author
%strong
=
commit
.
author_name
=
time_ago_in_words
(
commit
.
committed_date
)
...
...
app/views/layouts/project.html.haml
浏览文件 @
8170da06
...
...
@@ -16,7 +16,7 @@
.project-container
.project-sidebar
.fixed
%input
.git-url.text
{
:id
=>
""
,
:name
=>
""
,
:readonly
=>
""
,
:type
=>
"text"
,
:value
=>
@project
.
url_to_repo
}
%input
.git-url.text
{
:id
=>
""
,
:name
=>
""
,
:readonly
=>
""
,
:type
=>
"text"
,
:value
=>
@project
.
url_to_repo
,
:class
=>
"one_click_select"
}
%aside
=
link_to
"History"
,
project_path
(
@project
),
:class
=>
current_page?
(
:controller
=>
"projects"
,
:action
=>
"show"
,
:id
=>
@project
)
?
"current"
:
nil
=
link_to
"Tree"
,
tree_project_path
(
@project
),
:class
=>
current_page?
(
:controller
=>
"projects"
,
:action
=>
"tree"
,
:id
=>
@project
)
?
"current"
:
nil
...
...
app/views/projects/_tree_item.html.haml
浏览文件 @
8170da06
...
...
@@ -11,5 +11,8 @@
%td
=
time_ago_in_words
(
content_commit
.
committed_date
)
ago
%td
=
link_to
truncate
(
content_commit
.
safe_message
,
:length
=>
40
),
project_commit_path
(
@project
,
content_commit
)
%td
.commit
=
link_to
truncate
(
content_commit
.
safe_message
,
:length
=>
fixed_mode?
?
40
:
80
),
project_commit_path
(
@project
,
content_commit
),
:class
=>
"tree-commit-link"
-
tm
=
@project
.
team_member_by_name_or_email
(
content_commit
.
author_email
,
content_commit
.
author_name
)
-
if
tm
=
link_to
"[
#{
tm
.
user_name
}
]"
,
project_team_member_path
(
@project
,
tm
)
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录