Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
094e5efb
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,发现更多精彩内容 >>
提交
094e5efb
编写于
6月 24, 2014
作者:
D
Dmitriy Zaporozhets
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #6992 from skv-headless/project_commits_sql_optimization
notes count in 1 query for mr and commits
上级
aadef92f
20b21027
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
15 addition
and
4 deletion
+15
-4
app/controllers/projects/commits_controller.rb
app/controllers/projects/commits_controller.rb
+2
-0
app/controllers/projects/merge_requests_controller.rb
app/controllers/projects/merge_requests_controller.rb
+5
-0
app/views/projects/commits/_commit.html.haml
app/views/projects/commits/_commit.html.haml
+8
-4
未找到文件。
app/controllers/projects/commits_controller.rb
浏览文件 @
094e5efb
...
...
@@ -13,6 +13,8 @@ class Projects::CommitsController < Projects::ApplicationController
@limit
,
@offset
=
(
params
[
:limit
]
||
40
),
(
params
[
:offset
]
||
0
)
@commits
=
@repo
.
commits
(
@ref
,
@path
,
@limit
,
@offset
)
@note_counts
=
Note
.
where
(
commit_id:
@commits
.
map
(
&
:id
)).
group
(
:commit_id
).
count
respond_to
do
|
format
|
format
.
html
# index.html.erb
...
...
app/controllers/projects/merge_requests_controller.rb
浏览文件 @
094e5efb
...
...
@@ -32,6 +32,8 @@ class Projects::MergeRequestsController < Projects::ApplicationController
end
def
show
@note_counts
=
Note
.
where
(
commit_id:
@merge_request
.
commits
.
map
(
&
:id
)).
group
(
:commit_id
).
count
respond_to
do
|
format
|
format
.
html
format
.
diff
{
render
text:
@merge_request
.
to_diff
(
current_user
)
}
...
...
@@ -86,6 +88,9 @@ class Projects::MergeRequestsController < Projects::ApplicationController
@compare_failed
=
true
end
@note_counts
=
Note
.
where
(
commit_id:
@commits
.
map
(
&
:id
)).
group
(
:commit_id
).
count
@diffs
=
compare_action
.
diffs
@merge_request
.
title
=
@merge_request
.
source_branch
.
titleize
.
humanize
@target_project
=
@merge_request
.
target_project
...
...
app/views/projects/commits/_commit.html.haml
浏览文件 @
094e5efb
...
...
@@ -9,11 +9,15 @@
=
link_to
"Browse Code »"
,
project_tree_path
(
project
,
commit
),
class:
"pull-right"
.notes_count
-
notes
=
project
.
notes
.
for_commit_id
(
commit
.
id
)
-
if
notes
.
any?
-
if
@note_counts
-
note_count
=
@note_counts
.
fetch
(
commit
.
id
,
0
)
-
else
-
notes
=
project
.
notes
.
for_commit_id
(
commit
.
id
)
-
note_count
=
notes
.
count
-
if
note_count
>
0
%span
.label.label-gray
%i
.icon-comment
=
notes
.
count
%i
.icon-comment
=
note_count
-
if
commit
.
description?
.commit-row-description.js-toggle-content
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录